Commit Graph

3015 Commits

Author SHA1 Message Date
marination
e05013ede3 feat: Scan Barcode in Purchase Receipt 2020-04-06 22:13:13 +05:30
Deepesh Garg
aa775f87b2
fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer ()
* 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 ()
* 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
rohitwaghchaure
98a91f489d
Merge pull request 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 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 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 () 2020-03-31 15:26:45 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher ()
* 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 () 2020-03-26 13:29:02 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable () 2020-03-26 13:23:49 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection ()
* 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 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 () 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 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 () 2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes () 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 ()
* 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 ()
* 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 ()
* 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 () 2020-03-16 16:29:10 +05:30
Saqib
6ec4618914
fix: travis () 2020-03-11 16:04:00 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation () 2020-03-09 18:13:41 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ()
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 ()
* 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 ()
* 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 () 2020-02-27 18:18:10 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM ()
* fix: 'Last Purchase Rate' taking wrong on BOM. 

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

* 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. () 2020-02-26 12:48:36 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order () 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 ()
* 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 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
Deepesh Garg
40546d8af9
Merge pull request from marination/stock-settings-query
fix: Set Query on warehouse fields in Stock Settings
2020-02-19 18:57:24 +05:30
marination
120f75026f fix: Server side validation for Warehouses 2020-02-19 11:17:58 +05:30
marination
bde13b98e0 fix: Set Query on warehouse fields in Stock Settings 2020-02-18 21:35:59 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ()
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
abhijitkumbharIND
0047fcf7ad fix: HSN/SAC Error while creating a new item and not selecting the field. 2020-02-17 18:12:58 +05:30
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order ()
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
2020-02-17 15:58:08 +05:30
Himanshu Mishra
b76d2d4d98
Fix: Syntax error in get_child_warehouses 2020-02-12 13:22:05 +05:30
rohitwaghchaure
490b843ecf
Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop 2020-02-11 19:56:11 +05:30
rohitwaghchaure
3d98c59585
Merge pull request from ashish-greycube/fix_actual_qty_for_backflush
fix: backflush raw material based on - Material Transferred for Manufacture
2020-02-11 19:50:36 +05:30