Nabin Hait
|
a90a0528aa
|
Fixed conflict
|
2015-10-28 15:50:26 +05:30 |
|
Nabin Hait
|
6d490e530a
|
[fix] Ignore users permission for To Warehouse field in Delivery Note
|
2015-10-28 12:43:45 +05:30 |
|
Anand Doshi
|
c794ca53fb
|
[fix] delete file records created via item.py even if website_image file didn't exist
|
2015-10-27 16:56:42 +05:30 |
|
Anand Doshi
|
3f3696d1eb
|
[enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations
|
2015-10-26 21:55:34 +05:30 |
|
Nabin Hait
|
abc0b64b68
|
[fix] Label changed for Target Warehouse in Delivery Note
|
2015-10-26 11:58:43 +05:30 |
|
Anand Doshi
|
b9bfe6117e
|
[optimization] Stock Projected Qty report
|
2015-10-23 14:49:09 +05:30 |
|
Rushabh Mehta
|
5033e7b431
|
[hot] fix stock projected qty
|
2015-10-23 10:51:56 +05:30 |
|
Nabin Hait
|
398c83afa5
|
[fix] For Serial No Status
|
2015-10-22 15:11:44 +05:30 |
|
Anand Doshi
|
d1441245fb
|
[fix] variant website page render
|
2015-10-21 16:36:43 +05:30 |
|
Anand Doshi
|
066ff9599a
|
Merge pull request #4206 from neilLasrado/variant
Prevent Template Item from going into infinite loop while saving
|
2015-10-21 14:20:49 +05:30 |
|
Neil Trini Lasrado
|
3a573d1a6d
|
Prevent Template Item from going into infinite loop while saving
|
2015-10-21 12:20:06 +05:30 |
|
Rushabh Mehta
|
7f66983309
|
[minor] added column type definition in batch-wise balance history
|
2015-10-21 12:04:27 +05:30 |
|
Anand Doshi
|
ea0d98891f
|
[minor] don't display missing file doc message in item's make thumbnail
|
2015-10-20 18:57:38 +05:30 |
|
Anand Doshi
|
3bc43682f1
|
Merge pull request #4199 from neilLasrado/item
Default value of allow production order in Item master changed to 1
|
2015-10-20 17:44:26 +05:30 |
|
Anand Doshi
|
7c0eadb451
|
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
|
2015-10-20 17:30:02 +05:30 |
|
Neil Trini Lasrado
|
c0f88e4caf
|
Default value fot allow production order in Item master changed to 1
|
2015-10-20 15:51:04 +05:30 |
|
Anand Doshi
|
7b2b0cd73c
|
[fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level
|
2015-10-20 14:29:47 +05:30 |
|
Anand Doshi
|
17c633d00f
|
[fix] Set fieldtype of description field as Text Editor in Landed Cost Item
|
2015-10-20 14:26:44 +05:30 |
|
Nabin Hait
|
4d20f3029b
|
[fix] Set fieldtype of description field as Text in Landed Cost Item
|
2015-10-20 12:18:19 +05:30 |
|
Anand Doshi
|
25956d6282
|
[fix] Item thumbnail
|
2015-10-20 08:48:43 +05:30 |
|
Nabin Hait
|
6f64a78ecf
|
Test case fixed for swtiching valuation method
|
2015-10-19 16:53:35 +05:30 |
|
Nabin Hait
|
608bbc7850
|
Test case fixed for swtiching valuation method
|
2015-10-19 16:53:35 +05:30 |
|
Nabin Hait
|
afd14f6f0e
|
[fix] Allowed accounts with account type='Income Account' for default income account in item
|
2015-10-19 15:27:58 +05:30 |
|
Anand Doshi
|
b4e9c1da64
|
[fix] thumbnail generation for item
|
2015-10-19 12:57:19 +05:30 |
|
Anand Doshi
|
1d093a4039
|
[fix] change attach fields to small text
|
2015-10-19 12:56:29 +05:30 |
|
Rushabh Mehta
|
3a519f269d
|
Merge pull request #4175 from anandpdoshi/dynamic-linked-with
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
|
2015-10-15 14:25:18 +05:30 |
|
Rushabh Mehta
|
d3b8a74508
|
[test] fix, force values in target warehouse too
|
2015-10-15 13:23:10 +05:30 |
|
Anand Doshi
|
1d23ebb51d
|
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
|
2015-10-15 12:54:40 +05:30 |
|
Rushabh Mehta
|
ba5b0e8458
|
[test] [fix] print values for failing test
|
2015-10-15 12:45:42 +05:30 |
|
Rushabh Mehta
|
14a908bdec
|
[test] [fix] abs(valuation_rate) for moving average
|
2015-10-15 12:28:20 +05:30 |
|
Rushabh Mehta
|
f94f153078
|
[test] fixes
|
2015-10-15 11:31:59 +05:30 |
|
Rushabh Mehta
|
c9bacedbfe
|
[test] fixes
|
2015-10-15 11:00:34 +05:30 |
|
Rushabh Mehta
|
c4d4c7feb0
|
[fix] repost_actual_qty fix
|
2015-10-14 17:37:28 +05:30 |
|
Rushabh Mehta
|
ee6862b277
|
[fix] VARCHAR lengths as 140
|
2015-10-14 17:28:35 +05:30 |
|
Rushabh Mehta
|
fb73151da6
|
[fixes]
|
2015-10-14 16:22:01 +05:30 |
|
Rushabh Mehta
|
6e322d0a02
|
[enhancement] use thumbnails in grid views, patch to make thumbnails
|
2015-10-14 16:21:24 +05:30 |
|
Rushabh Mehta
|
80d2a55342
|
[enhancement] add variants in website
|
2015-10-14 16:16:00 +05:30 |
|
Anand Doshi
|
71ebad5668
|
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
|
2015-10-14 16:13:49 +05:30 |
|
Nabin Hait
|
38e4c6f2af
|
Allow same serial nos for raw materials and fg item in repack / manufacture entry
|
2015-10-13 18:37:39 +05:30 |
|
Nabin Hait
|
03afb45e34
|
[fix] Validate deletion of serial no
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
d91382dbf3
|
[fix] serial no status
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
b445be3552
|
Test case for delivery to target warehouse
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
c865f229fb
|
Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status
|
2015-10-13 15:46:42 +05:30 |
|
Rushabh Mehta
|
22d0d586ab
|
[minor] [typo]
|
2015-10-13 12:30:21 +05:30 |
|
Rushabh Mehta
|
eb62aed8c7
|
Merge pull request #4157 from nabinhait/bin
[fix][patch] Delete duplicate bins
|
2015-10-12 18:39:16 +05:30 |
|
Rushabh Mehta
|
5f349a67c9
|
Merge pull request #4156 from rmehta/item-section-fix
[fix] [minor] collapsible section for Item - removed custom script
|
2015-10-12 18:35:38 +05:30 |
|
Rushabh Mehta
|
d256055a8c
|
Merge pull request #4153 from rmehta/stock-entry-fix
[fix] [minor] stock_entry.py error for None qty
|
2015-10-12 18:32:28 +05:30 |
|
Nabin Hait
|
b7e46c4ed9
|
[fix][patch] Delete duplicate bins
|
2015-10-12 18:28:50 +05:30 |
|
Rushabh Mehta
|
d4882653c3
|
[fix] [minor] collapsible section for Item - removed custom script
|
2015-10-12 16:45:53 +05:30 |
|
Rushabh Mehta
|
a30f3ea1f9
|
[fix] [minor] stock_entry.py error for None qty
|
2015-10-12 16:12:52 +05:30 |
|
Nabin Hait
|
51e980dd2c
|
[fix] Multiple minor fixes
|
2015-10-10 18:10:05 +05:30 |
|
Nabin Hait
|
314086d6c0
|
[fix] Fetch UOM Conversion Factor from template if not specified in variants
|
2015-10-07 11:55:08 +05:30 |
|
Nabin Hait
|
5c66fb7631
|
Merge pull request #4130 from nabinhait/reports
[fix][report] Left join used in pending reports
|
2015-10-07 11:15:36 +05:30 |
|
Nabin Hait
|
8a7bdd5a92
|
[fix] Valuation Rate in Stock Balance report
|
2015-10-06 18:46:56 +05:30 |
|
Nabin Hait
|
f4edaef481
|
[fix][report] Left join used in pending reports
|
2015-10-06 12:48:04 +05:30 |
|
Anand Doshi
|
21f6ea6f7e
|
[hotfix] remove allow on submit from item tables
|
2015-09-30 18:45:29 +05:30 |
|
Anand Doshi
|
c320fe541d
|
Merge pull request #4067 from anandpdoshi/remove-party-account-currency
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
|
2015-09-30 16:55:24 +05:30 |
|
Anand Doshi
|
f40a87511e
|
Merge pull request #4091 from rmehta/repack-allow-low-rate
[fix] remove validation to disallow lower rate
|
2015-09-30 16:46:31 +05:30 |
|
Rushabh Mehta
|
cb96b61449
|
[fix] remove validation to disallow lower rate
|
2015-09-30 16:22:05 +05:30 |
|
Anand Doshi
|
cd0989e051
|
Added method get_account_currency
|
2015-09-30 15:11:12 +05:30 |
|
Anand Doshi
|
edba8f5582
|
[fix] Print 'Attach' field in Stock Entry Detail
|
2015-09-30 11:50:08 +05:30 |
|
gmarke
|
e5a31462fe
|
Update get_item_details.py
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
|
2015-09-27 09:38:01 +02:00 |
|
Anand Doshi
|
361eca4cae
|
Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit
Sales Team editable after submit
|
2015-09-24 11:30:31 +05:30 |
|
Anand Doshi
|
e2d46d0474
|
[fix] Allow Sales Team to be added/updated after submit
|
2015-09-23 19:26:29 +05:30 |
|
Anand Doshi
|
06ad308ca1
|
[fixes] setup wizard and other fixes related to cart
|
2015-09-23 12:50:35 +05:30 |
|
Anand Doshi
|
52dfc32eca
|
[fix] validate_valuation_rate for Repack
|
2015-09-23 12:50:35 +05:30 |
|
Rushabh Mehta
|
8ffd483e24
|
[wip] shopping cart shipping rule, price list cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
156ce607e2
|
[cleanup] [wip] portal, shopping cart cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Anand Doshi
|
b6ec680c46
|
[fix] round percentages in get_indicator
|
2015-09-22 16:36:20 +05:30 |
|
Saurabh
|
5fe0086d9a
|
[Fixes] Warehouse check while company delete & Variant Attribute value check
|
2015-09-16 16:59:24 +05:30 |
|
Anand Doshi
|
69f2cc8d24
|
[fix] don't fetch template item in get items of stock reconciliation
|
2015-09-15 11:54:13 +05:30 |
|
Anand Doshi
|
dbe623b167
|
[fix] Use User Permission value as default only if the document type is Setup
|
2015-09-14 13:08:53 +05:30 |
|
Anand Doshi
|
5d9cfc76cd
|
Don't copy title field in Duplicate
|
2015-09-11 15:35:26 +05:30 |
|
Nabin Hait
|
2377cdfa4e
|
Fixed conflict
|
2015-09-09 18:45:41 +05:30 |
|
Anand Doshi
|
9d5b84e78a
|
Merge pull request #3996 from nabinhait/fix6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
|
2015-09-09 15:11:12 +05:30 |
|
Nabin Hait
|
f0b3014a23
|
Planned Qty logic fixed and reposted for existing
|
2015-09-09 11:04:10 +05:30 |
|
Nabin Hait
|
cd103c05d6
|
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
|
2015-09-08 19:24:35 +05:30 |
|
Anand Doshi
|
bc1e8b4408
|
[minor] Unset Apply User Permissions in default permissions
|
2015-09-08 19:23:23 +05:30 |
|
Nabin Hait
|
6c3ff3e2ed
|
Fixed conflict
|
2015-09-08 18:09:03 +05:30 |
|
Anand Doshi
|
9f25575e0c
|
Merge pull request #3988 from nabinhait/fix2
Set expense account in stock reco only if company available
|
2015-09-08 15:59:18 +05:30 |
|
Nabin Hait
|
f44128f81c
|
Set expense account in stock reco only if company available
|
2015-09-07 10:45:15 +05:30 |
|
Nabin Hait
|
11a746d363
|
Fixed conflict
|
2015-09-03 16:04:11 +05:30 |
|
Rushabh Mehta
|
85abdc4fad
|
[minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291
|
2015-09-03 10:29:38 +05:30 |
|
Anand Doshi
|
283850ce47
|
Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes
Attributes in the variant should be in the same order as in the Template
|
2015-09-02 16:09:09 +05:30 |
|
Anand Doshi
|
099bbbded0
|
Attributes in the variant should be in the same order as in the Template
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
|
2015-09-02 15:56:55 +05:30 |
|
Nabin Hait
|
906bf64f04
|
[fix] Insert Item Price automatically based on Rate in Stock UOM
|
2015-09-02 11:32:14 +05:30 |
|
Nabin Hait
|
76bb927337
|
Fixed conflict
|
2015-08-31 17:28:05 +05:30 |
|
Nabin Hait
|
6e439a5e53
|
Multi currency: test case and fixes
|
2015-08-28 19:24:22 +05:30 |
|
Anand Doshi
|
8b66f2a691
|
Exported all doctypes
|
2015-08-27 16:45:52 +05:30 |
|
Anand Doshi
|
f370b0c6a4
|
[fix] print hide additional discount, reload doctypes in sales return patch
|
2015-08-27 16:03:29 +05:30 |
|
Nabin Hait
|
09c68c9ad0
|
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
|
2015-08-27 14:55:55 +05:30 |
|
Nabin Hait
|
13d8835b75
|
Fixed merge conflict
|
2015-08-27 14:55:34 +05:30 |
|
Anand Doshi
|
b8610e1079
|
[fix] removed update_stock_ledger from delivery note
|
2015-08-27 14:46:47 +05:30 |
|
Anand Doshi
|
41e948b00a
|
[hotfix] update reserved quantity in delivery note
|
2015-08-27 14:42:25 +05:30 |
|
Anand Doshi
|
c6802ca6d0
|
[minor] show Inventory section for new Item if Maintain Stock is checked
|
2015-08-27 13:21:43 +05:30 |
|
Anand Doshi
|
282e4947fa
|
[fix] Changed more section label to 'More Information'
|
2015-08-27 13:11:46 +05:30 |
|
Anand Doshi
|
b99c180466
|
Merge branch 'rmehta-validation-settings' into develop
|
2015-08-27 12:22:06 +05:30 |
|
Rushabh Mehta
|
740db53b86
|
[fix] returned_qty reapply and change-log
|
2015-08-27 12:00:16 +05:30 |
|
Anand Doshi
|
69b6195d3b
|
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
|
2015-08-27 11:39:20 +05:30 |
|
Rushabh Mehta
|
cd2d8a0410
|
[merge] re-applied changes to sales invoice & delivery note
|
2015-08-27 11:05:26 +05:30 |
|