Sagar Vora
|
da1dc7fa52
|
Merge branch 'master' into develop
|
2019-02-05 18:40:39 +05:30 |
|
Saif Ur Rehman
|
1a441b267d
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-02-01 19:17:04 +05:00 |
|
Nabin Hait
|
f3f4ce9b87
|
fix: Fetch data based on item group filter in item dashboard stock balance report
|
2019-02-01 12:01:19 +05:30 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Nabin Hait
|
cc41b876fb
|
Merge pull request #16497 from nabinhait/bom_price
BOM raw materials price
|
2019-01-29 14:58:40 +05:30 |
|
Nabin Hait
|
4e45663297
|
fix(stock): get item price based on party
|
2019-01-29 14:02:08 +05:30 |
|
Nabin Hait
|
8ba9545b72
|
Merge pull request #16498 from nabinhait/stock-ledger-report
fix(stock): Escaping issue in stock ledger report
|
2019-01-29 11:30:15 +05:30 |
|
Nabin Hait
|
e8190473f5
|
Merge branch 'staging-fixes' into unicode
|
2019-01-29 11:13:04 +05:30 |
|
Nabin Hait
|
1187d61b56
|
fix(stock): Escaping issue in stock ledger report
|
2019-01-25 17:07:29 +05:30 |
|
Nabin Hait
|
01ca3e5e36
|
fix(manufacturing): Get raw materials rate from price list ignoring party
|
2019-01-25 16:25:15 +05:30 |
|
Nabin Hait
|
fc9e733d7f
|
Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission
fix: Show stock levels in Item master based on user permissions
|
2019-01-25 09:48:43 +05:30 |
|
Saif Ur Rehman
|
3d275af67b
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
|
2019-01-24 23:40:16 +05:00 |
|
Suraj Shetty
|
7a45887fa1
|
fix typo
|
2019-01-24 16:26:48 +05:30 |
|
Suraj Shetty
|
dd0496f7aa
|
Add missed out field field
|
2019-01-24 16:18:43 +05:30 |
|
Suraj Shetty
|
c165838228
|
Filter bin list based on warehouses that are accessible to the user
|
2019-01-24 15:45:46 +05:30 |
|
Frappe Bot
|
e415cce1a9
|
Merge branch 'staging' into develop
|
2019-01-23 08:19:00 +00:00 |
|
Aditya Hase
|
55a08dee78
|
style: Remove unusued local variable
|
2019-01-23 00:28:02 +05:30 |
|
Aditya Hase
|
f3c22f342c
|
fix(unicode): Import unicode_literals in every file
|
2019-01-22 18:36:10 +05:30 |
|
Saif Ur Rehman
|
74a3370095
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
|
2019-01-22 16:20:40 +05:00 |
|
Sagar Vora
|
4d1a9b10ed
|
Merge branch 'staging' into develop
|
2019-01-22 15:56:39 +05:30 |
|
Nabin Hait
|
f0ea152022
|
Merge pull request #16289 from Anurag810/Quality-inspection-fix
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
|
2019-01-22 10:49:55 +05:30 |
|
Saif Ur Rehman
|
398f593e5f
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-01-18 17:33:19 +05:00 |
|
Nabin Hait
|
bace4d3e6d
|
Merge pull request #16358 from adityahase/naming-series
feat(naming): Deferred naming for SLE and GL Entry
|
2019-01-18 10:55:30 +05:30 |
|
Nabin Hait
|
bef2c22d23
|
Fix: merge conflict
|
2019-01-18 10:15:47 +05:30 |
|
Nabin Hait
|
6202d0ed68
|
fix: NoneType comparison with int error
|
2019-01-18 09:40:24 +05:30 |
|
Nabin Hait
|
30667c160d
|
test: Inter company stock transfer for serialised items
|
2019-01-18 09:36:18 +05:30 |
|
Nabin Hait
|
5a87ac0ad8
|
fix: Inter company stock transfer for serialised items
|
2019-01-18 09:36:18 +05:30 |
|
Nabin Hait
|
983d102a19
|
Merge branch 'staging-fixes' into Quality-inspection-fix
|
2019-01-16 17:52:30 +05:30 |
|
Nabin Hait
|
3dd5f55412
|
feat(stock-reco): Fetch items in stock reco based on group warehouse
|
2019-01-16 16:20:05 +05:30 |
|
Nabin Hait
|
158e7dcd8b
|
fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM
|
2019-01-16 16:00:25 +05:30 |
|
Nabin Hait
|
7686aa9ff6
|
Merge pull request #16400 from Zlash65/fix-deff
fix: for deferred settings for Item
|
2019-01-16 10:16:00 +05:30 |
|
Saurabh
|
7d630b3e29
|
Merge branch 'master' into staging-fixes
|
2019-01-15 19:41:09 +05:30 |
|
Zlash65
|
a3dd798bad
|
clean if conditions
|
2019-01-15 16:05:42 +05:30 |
|
Zlash65
|
627be1de51
|
minor fixes for deferred calculations
|
2019-01-15 14:16:50 +05:30 |
|
Nabin Hait
|
acd7f73d57
|
Merge branch 'hotfix' into group_warehouse_stock_reco
|
2019-01-14 20:25:53 +05:30 |
|
Nabin Hait
|
4ed7cfc515
|
tests(cost-center-company): Validate cost center's company and revent tests
|
2019-01-14 17:14:39 +05:30 |
|
Fisher Yu
|
2cd49f51e2
|
fix issue #16284, child table copy (#16285)
* fix issue #16284, child table copy
V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float'
* Update get_item_details.py
consider the empty string case
* Update get_item_details.py
|
2019-01-11 15:31:33 +05:30 |
|
Nabin Hait
|
0d208851a4
|
Fix(stock-reco): Fixed codacy issues
|
2019-01-10 17:56:11 +05:30 |
|
Nabin Hait
|
afbdaa525e
|
Merge pull request #16365 from hiousi/patch-1
fix: variant can not get its price
|
2019-01-10 10:36:27 +05:30 |
|
Saif Ur Rehman
|
8d61794540
|
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
|
2019-01-10 04:23:40 +05:00 |
|
Saif Ur Rehman
|
edd0e2476f
|
chore: Updated item.json, no changes
|
2019-01-10 04:16:10 +05:00 |
|
Saif Ur Rehman
|
2689dea72a
|
fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse
|
2019-01-09 13:43:06 +05:00 |
|
Saif Ur Rehman
|
eb7277d2d4
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/patches.txt
|
2019-01-09 11:25:53 +05:00 |
|
Saif Ur Rehman
|
091cfba5fc
|
test: Added test for get_item_tax_template and get_item_tax_map
|
2019-01-09 11:24:30 +05:00 |
|
hiousi
|
9671438435
|
Update get_item_details.py
|
2019-01-08 22:23:45 +01:00 |
|
hiousi
|
1516e29609
|
[fix] variant can not get its price
get_price_list_rate() return empty dict before trying to get the item price for a variant.
|
2019-01-08 18:34:08 +01:00 |
|
Saurabh
|
afec3ca89a
|
Merge branch 'staging' into develop
|
2019-01-08 17:09:36 +05:30 |
|
rohitwaghchaure
|
ffdadbf97f
|
fix: fallback to stock uom if uom is not defined (#16329)
* [minor] Code cleanup
* fix: remove 'or' condition, won't execute
|
2019-01-08 16:21:25 +05:30 |
|
Saif Ur Rehman
|
380b4b0926
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
|
2019-01-08 13:41:46 +05:00 |
|
Nabin Hait
|
4c08aaef3d
|
Merge pull request #16290 from deepeshgarg007/stock-recon
fix: Unorderable type error while making stock reconciliation entry
|
2019-01-08 11:55:49 +05:30 |
|