Saurabh
|
3dd7ddd838
|
Merge branch 'master' into develop
|
2019-02-21 18:25:29 +05:30 |
|
Nabin Hait
|
816a4655a0
|
fix: Consider returned qty while making invoice from DN / PR
|
2019-02-21 12:02:36 +05:30 |
|
Saurabh
|
482ebd2c7c
|
Merge branch 'master' into develop
|
2019-02-20 18:14:18 +05:30 |
|
Rohit Waghchaure
|
389cd6ad63
|
fix: stop button not working in material request
|
2019-02-19 19:18:07 +05:30 |
|
Sagar Vora
|
cc6e51c62d
|
Merge branch 'master' into develop
|
2019-02-19 18:09:49 +05:30 |
|
Nabin Hait
|
8e9d947527
|
Merge branch 'hotfix' into fix-item-variant-settings-barcodes
|
2019-02-19 15:07:46 +05:30 |
|
Nabin Hait
|
818ead4041
|
Merge branch 'hotfix' into purchase-qty-fix
|
2019-02-19 15:06:10 +05:30 |
|
deepeshgarg007
|
de0f59b818
|
fix: Removed precision from multiple doctypes
|
2019-02-19 08:40:16 +05:30 |
|
deepeshgarg007
|
9a19e06856
|
fix: Change Received qty to accepted qty and validation for indicators
|
2019-02-18 18:42:15 +05:30 |
|
Suraj Shetty
|
cc0222a28a
|
Remove unwanted barcode field from item
|
2019-02-16 17:53:23 +05:30 |
|
Frappe Bot
|
74fd5daeb2
|
Merge branch 'master' into develop
|
2019-02-15 10:22:33 +00:00 |
|
Nabin Hait
|
54f8ed1282
|
Merge branch 'hotfix' into item-variants
|
2019-02-14 18:50:11 +05:30 |
|
Faris Ansari
|
a748ca69e7
|
fix: Validate invalid fields in Item Variant Settings
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
|
2019-02-13 13:02:39 +05:30 |
|
rohitwaghchaure
|
a0aaeafae8
|
Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg
fix: validation message for work order
|
2019-02-13 09:49:25 +05:30 |
|
Nabin Hait
|
db527bfb24
|
fix: Enqueued item variants updation if there are more than 30 variants
|
2019-02-12 18:30:00 +05:30 |
|
Sagar Vora
|
551f52fd25
|
Merge branch 'master' into develop
|
2019-02-12 16:41:24 +05:30 |
|
Nabin Hait
|
fdefbdb23b
|
Merge pull request #16609 from nabinhait/multipel_fixes
Multiple fixes
|
2019-02-12 13:56:06 +05:30 |
|
Rohit Waghchaure
|
e0412a177c
|
fix: validation message for work order
|
2019-02-12 11:47:16 +05:30 |
|
Faris Ansari
|
453964728d
|
fix: Set company_currency for Warehouse Tree
|
2019-02-09 20:27:42 +05:30 |
|
Nabin Hait
|
17e0513270
|
fix: message if stock reco is enqueued
|
2019-02-08 16:56:26 +05:30 |
|
Nabin Hait
|
8d4bb3e327
|
fix: backflush only if transferred item is present in work order
|
2019-02-08 16:56:26 +05:30 |
|
Nabin Hait
|
450fe309d6
|
fix: allow updating title of material request
|
2019-02-08 16:56:26 +05:30 |
|
Aditya Hase
|
6e1bb60b58
|
fix(py3): Convert filter to list for indexing
|
2019-02-07 22:21:05 +05:30 |
|
Aditya Hase
|
e1f867f29f
|
fix(py3): Explicitly convert to float for comparison
|
2019-02-07 22:21:05 +05:30 |
|
Aditya Hase
|
691c166a56
|
fix(py3): Use six.text_type instead of unicode
|
2019-02-07 20:35:52 +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 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +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 |
|
Saurabh
|
7d630b3e29
|
Merge branch 'master' into staging-fixes
|
2019-01-15 19:41:09 +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 |
|
Nabin Hait
|
0d208851a4
|
Fix(stock-reco): Fixed codacy issues
|
2019-01-10 17:56:11 +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
|
091cfba5fc
|
test: Added test for get_item_tax_template and get_item_tax_map
|
2019-01-09 11:24:30 +05:00 |
|
Saurabh
|
afec3ca89a
|
Merge branch 'staging' into develop
|
2019-01-08 17:09:36 +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 |
|
Aditya Hase
|
0c16424d7d
|
fix(naming): Use creation instead of name to order SLEs
|
2019-01-08 00:09:36 +05:30 |
|