Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Shivam Mishra
43cebdff4d
fix: translated title ( #18119 )
2019-07-01 11:01:28 +00:00
Nabin Hait
f5aff98589
fix: Validate changes in batch, serial nos, val method fields ( #18064 )
2019-06-28 12:47:44 +05:30
Aditya Hase
ce9cdfb056
fix(ui): better message after creating serial numbers ( #18093 )
...
fix(ui): better message after creating serial numbers
2019-06-27 18:20:13 +05:30
Aditya Hase
7f3ebb1d06
Merge branch 'develop' into stock-ledger-link
2019-06-27 18:19:15 +05:30
Aditya Hase
b9c9ada3f8
Merge pull request #18090 from scmmishra/twelve-fixes
...
fix: print message for insufficient stock
2019-06-27 18:18:24 +05:30
Shivam Mishra
468d5563c6
fix: set serial numbers as data field
2019-06-27 14:13:54 +05:30
Shivam Mishra
e1aec5519b
fix(ui): better message after creating serial numbers
2019-06-27 13:14:41 +05:30
Shivam Mishra
bc777b1732
fix: styling for sort selector
2019-06-27 12:43:39 +05:30
Shivam Mishra
9e07b7d2b8
Merge branch 'develop' into twelve-fixes
2019-06-27 09:44:41 +05:30
Rohit Waghchaure
6de3ed5416
fix: dn test cases
2019-06-26 21:58:42 +05:30
rohitwaghchaure
387ee8f511
fix: returned qty issue while making sales invoice from dn if same item added multiple times ( #18076 )
2019-06-26 13:40:26 +05:30
Shivam Mishra
9479f7f1ef
fix: print message for insufficient stock
2019-06-26 10:37:00 +05:30
Mangesh-Khairnar
558a5c199f
fix(price list): change the field name
2019-06-24 17:32:04 +05:30
Rushabh Mehta
5162b7457f
Merge pull request #17918 from Alchez/develop-item-code-gen
...
fix(stock): Remove hardcoded validation for Item
2019-06-20 14:21:57 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email
...
fix(delivery): Add items to context for dispatch notification email
2019-06-19 14:37:23 +05:30
Anurag Mishra
3d47a6dbb5
fix: Company filters in Total Stock Summary Report ( #17965 )
2019-06-17 17:49:04 +05:30
Rohan Bansal
4babfdb987
fix(delivery): Add more context for dispatch notification email + formatting fixes
2019-06-17 16:16:51 +05:30
Rohit Waghchaure
725f56faca
feat: delayed order reports
2019-06-17 12:50:44 +05:30
Anurag Mishra
4c1639305f
feat: creating stock entry against purchase receipt
2019-06-14 12:31:08 +05:30
Shivam Mishra
4def9836e0
Merge branch 'develop' into bom-item-fix
2019-06-13 16:17:54 +05:30
Mangesh-Khairnar
b2f266ad10
fix: get bom item when company is not passed
2019-06-13 14:34:40 +05:30
Deepesh Garg
0d7d4879a9
Merge pull request #17920 from Anurag810/stock_balance_report
...
fix: fetch item on the base of item group
2019-06-13 10:49:30 +05:30
Anurag Mishra
bbe2c4fb01
fix: fetch item on the base of item group
2019-06-12 19:09:51 +05:30
Rohan Bansal
ddea50fa22
fix(stock): Remove hardcoded validation for Item
2019-06-12 17:59:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop
...
fix: set COGS for material issue only
2019-06-10 16:57:23 +05:30
Rohit Waghchaure
9a792c2eed
stock_entry: set COGS for material issue only
2019-06-07 15:20:36 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
deepeshgarg007
e19abb162a
fix: Resolve merge conflicts in purchase_receipt_item
2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
Saurabh
f68bd8f349
Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop
...
fix: allow import for packing slip
2019-05-31 14:24:51 +05:30
Saurabh
731986d8ee
Merge pull request #17811 from nabinhait/pr-expense-account-dev
...
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-31 14:19:47 +05:30
Rohit Waghchaure
e98d1c1147
fix: allow import for packing slip
2019-05-31 14:16:11 +05:30
deepeshgarg007
2580075583
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-30 22:11:27 +05:30
Nabin Hait
0e1e37c921
fix: Added Expense Account field to push value from PO-PR-PI
2019-05-30 18:13:41 +05:30
Saif Ur Rehman
7129231dbb
fix(Product Bundle Balance): Update frappe.db.escape for v12
2019-05-30 13:55:32 +05:00
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance
2019-05-29 18:23:21 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
Anurag Mishra
a69f72988a
fix: requested filters changes
2019-05-28 11:08:14 +05:30
Anurag Mishra
32c23ae274
fix: added read write permission to stock manager
2019-05-27 18:37:04 +05:30
Anurag Mishra
61a7b42aea
fix: added permission and fix filters in stock balance report
2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0
feat: added warehouse type master
2019-05-27 18:37:04 +05:30
Nabin Hait
e662be7508
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
...
fix: update received qty in PO from PR and PI
2019-05-27 17:16:40 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance
2019-05-27 14:01:00 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17725 )
2019-05-27 13:42:29 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
