Rushabh Mehta
9f7de868ef
[fixes] stock reco, must always set qty and rate
2015-11-30 14:16:36 +05:30
Anand Doshi
70f57eb7f0
[fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table
2015-11-27 14:38:01 +05:30
Anand Doshi
15b22c9d7d
Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template
...
[fix] Show Item Name in re-order email. Fixes #4381
2015-11-27 11:31:36 +05:30
Anand Doshi
f942d97a18
[fix] removed UOM Replace Utility from message
2015-11-26 16:08:09 +05:30
Anand Doshi
5cf7a0bf72
[fix] Show Item Name in re-order email. Fixes #4381
2015-11-26 15:11:18 +05:30
Rushabh Mehta
03b3d66b90
[minor] re-order at re-order level, not below
2015-11-25 17:23:00 +05:30
Nabin Hait
c4f4c09e42
Get Items from Product Bundle button in purchase cycle
2015-11-23 12:51:37 +05:30
Revant Nandgaonkar
bde324a90f
fix frappe call to update_purchase_receipt_status
...
changed update_purchase_order_status to update_purchase_receipt_status
2015-11-20 12:41:58 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Saurabh
2e292060c5
[fix] Reserved and ordered qty fix for drop ship orders
2015-11-18 17:39:26 +05:30
Nabin Hait
43ce642649
[fix] Uncheck 'Is Production Item' if it is a non-stock item
2015-11-16 16:50:59 +05:30
Nabin Hait
95d025f9aa
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
2015-11-13 14:22:32 +05:30
Rushabh Mehta
c1531e7008
[minor] catch SSL error on make_thumbnail, via support
2015-11-13 11:39:38 +05:30
Anand Doshi
d65a03d437
[fix] material request type in reorder
2015-11-12 20:36:44 +05:30
Nabin Hait
61fb7ee5b8
Deleted Stock UOM Replace Utility
2015-11-12 12:06:47 +05:30
Rushabh Mehta
54fc260a42
[minor] trigger link triggers while mapping material request to po to set supplier default currency
2015-11-05 15:26:02 +05:30
Rushabh Mehta
7a39d51366
[fix] pull tax rate in item tax
2015-11-05 15:19:11 +05:30
Rushabh Mehta
c541b87bb9
[thumbnail] remove attachment if fails
2015-11-05 10:49:42 +05:30
Rushabh Mehta
20a7d820ab
[fix] shot ledger buttons for closed DN / PR
2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8
[cleanup] drop ship testing & cleanup
2015-11-04 15:24:04 +05:30
Saurabh
6197860643
[fixes] test case update
2015-11-04 12:43:40 +05:30
Saurabh
95fbfa4928
[fixes] typo fixes
2015-11-04 12:10:01 +05:30
Saurabh
b7f0a4961e
- no delivery / reserve warehouse in drop ship
...
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff
[cleanup] re-arrange drop ship field
2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0
[fix] cleanup stop-resume code
2015-11-03 18:20:39 +05:30
Saurabh
c40148e0da
[fixes] missing delivered by supplier field
2015-11-03 10:32:46 +05:30
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Saurabh
a8a91cca16
[feature] Close feature for Purchase Receipt and Delivery Note
2015-11-02 12:57:08 +05:30
Saurabh
381385d19a
[fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO
2015-11-02 11:30:51 +05:30
Saurabh
653cffec1e
[change_log and fixes] set print hide, add change_log
2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56
[fixes] test case fixes for drop shipping
2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
2015-10-29 19:43:35 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7
[fixes] check for close status
2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e
[fixes] filter on supplier list for DropShip, checking closed status
2015-10-29 19:43:33 +05:30
Saurabh
98b287565a
[enhance] close purchase order
2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256
[Fixes] Drop Shipping
2015-10-29 19:43:32 +05:30
Anand Doshi
21e09a2bd8
[enhancement] Ability to disable an Item
2015-10-29 12:39:47 +05:30
Anand Doshi
6d69ca6bac
[fix] don't show expired items in website item list. Fixes #4210 .
2015-10-29 11:35:16 +05:30
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
Rushabh Mehta
5bec301929
Merge branch 'layout-cleanup' into develop
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
erpnext/stock/doctype/delivery_note/delivery_note.json
2015-08-27 11:01:39 +05:30
Rushabh Mehta
17679c6902
[layout cleanup] purchase, stock, journal entry
2015-08-26 22:20:38 +05:30
Anand Doshi
fa65c7bf29
[minor] stopped or cancelled message
2015-08-26 19:15:24 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Anand Doshi
ab9f03d557
Merge pull request #3952 from neilLasrado/variant-duplication
...
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 16:52:25 +05:30
Neil Trini Lasrado
755f1f6841
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
2015-08-26 12:59:29 +05:30
Anand Doshi
80a784fdc5
Merge pull request #3943 from nabinhait/fix4
...
[fix] Print Delivery Note without amount
2015-08-26 12:29:24 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8
Update delivered / ordered qty in sales/purchase order from return entry
...
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Nabin Hait
a7c013c030
[fix] Print Delivery Note without amount
2015-08-24 18:43:19 +05:30
Neil Trini Lasrado
db189d7f19
Fixed test case for Item Variants
2015-08-24 16:59:24 +05:30
Neil Trini Lasrado
4c614bd59a
Fixed validation for numeric variants to check with values from template instead of master
2015-08-24 15:13:01 +05:30
Neil Trini Lasrado
7a6f048928
Fixed issue while creating item variants with decimal values (precision error)
2015-08-24 15:13:01 +05:30
Anand Doshi
bcb386fb64
Merge pull request #3922 from nabinhait/fraction_gle
...
Divisonal loss adjustment in purchase receipt
2015-08-21 14:55:44 +05:30
Nabin Hait
7c2901fb56
[fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation
2015-08-21 14:45:59 +05:30
Nabin Hait
c561a499d7
Multi currency GL entry fixes
2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b
GL Entry in account currency
2015-08-21 14:31:47 +05:30
Nabin Hait
597a402dff
Divisonal loss adjustment in purchase receipt
2015-08-21 14:13:55 +05:30
Nabin Hait
1b6fd1ba5b
[fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation
2015-08-21 13:05:19 +05:30
Nabin Hait
d7ed197131
[fix] UOM Conversion factor mandatory in stock entry
2015-08-21 12:00:32 +05:30
Anand Doshi
db1a9edbdf
[minor] removed test case of template cannot have stock
2015-08-20 18:20:06 +05:30
Anand Doshi
5c85740aab
[minor] don't validate stock for template item
2015-08-20 17:43:35 +05:30
Anand Doshi
98c3aec274
[minor] hide Attribute Value using script so that it is visible in data import
2015-08-20 11:56:31 +05:30
Anand Doshi
f3eeb601ad
Merge pull request #3908 from rmehta/text-editor
...
[fix] changed text > text editor for description fields in tables
2015-08-19 16:48:06 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Anand Doshi
8af567a229
[minor] import error
2015-08-19 12:10:03 +05:30
Anand Doshi
ffca81dbc1
[fix] added test cases and fixes to Item Variants
2015-08-19 11:52:05 +05:30
Anand Doshi
90fd6fee23
[fix] generate item code for variant
2015-08-19 10:21:24 +05:30
Anand Doshi
2538e51887
Fixes to Item Variant Attribute. Fixes #3905
2015-08-19 09:33:07 +05:30
Anand Doshi
cf2c624c03
Merge pull request #3902 from rmehta/pos-print
...
[enhancement] POS print after save #3853
2015-08-18 18:32:04 +05:30
Rushabh Mehta
ad9156a6ae
[enhancement] POS print after save #385:wq:wq
2015-08-18 18:05:43 +05:30
Anand Doshi
afbe39a559
[fix] patch and rename Variant Attribute to Item Variant Attribute
2015-08-18 17:30:44 +05:30
Nabin Hait
91e1077e4c
[fix] precision issue in stock entry
2015-08-17 17:58:52 +05:30
Nabin Hait
1c98886c85
[fix] Get stock and rate function restored
2015-08-17 17:58:52 +05:30
Anand Doshi
862c36832a
Merge pull request #3892 from nabinhait/fix1
...
[fix] Get stock and rate function restored
2015-08-17 14:26:01 +05:30
Nabin Hait
c01342190c
[fix] precision issue in stock entry
2015-08-17 14:18:44 +05:30
Nabin Hait
ac07b1cc07
[fix] Get stock and rate function restored
2015-08-17 10:50:30 +05:30
Neil Trini Lasrado
68f66a7e8b
fixed Test Cases
2015-08-13 17:34:25 +05:30
Neil Trini Lasrado
9710eede00
Fixed Test Cases
2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
cdc060cb7c
Allow Editing variant attribute in Variant. Add validation to check duplication.
2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
b9b49632f2
Added patch to fetch Item Template Attributes
2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
ebf4cbeae3
Fixed Manage Variant
2015-08-13 16:17:01 +05:30
Neil Trini Lasrado
8b608c9043
Search Variants added to Item Master
...
Added feature for Variants to hande numeric values
2015-08-13 16:17:01 +05:30
Anand Doshi
cb4784c940
Merge pull request #3822 from neilLasrado/item-uom
...
Changed UOM validation for Item Master
2015-08-13 14:36:37 +05:30
Nabin Hait
58aea1f819
minor fix
2015-08-13 14:15:27 +05:30
Nabin Hait
760bfb27d0
Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7
2015-08-13 14:14:26 +05:30
Neil Trini Lasrado
9a73b7a319
Changed UOM validation for Item Master
2015-08-13 12:21:32 +05:30
Anand Doshi
57ca765d9e
Merge pull request #3848 from rmehta/journal-entry-refactor
...
[refactor] added dynamic link in journal entry, #3847 , #3814
2015-08-13 11:39:13 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Nabin Hait
4a91c49e0d
discount percentage should not be reset to zero on applying price list
2015-08-11 18:16:10 +05:30
Nabin Hait
ac6d11eb3c
minor improvements
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
1c6eeb228f
Fixes in Stock Entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
b44f26d1ba
Fixed Max value for update FG Item in Production Order
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
8ea2f45713
Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
dde65752b6
Fixed code to consider partial FG entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010
Added Feature - Update FG based on Material Transfer For Manufacturing
2015-08-10 19:14:43 +05:30
Nabin Hait
3c3a3ecea8
Additional Costs in Stock Entry
2015-08-10 14:07:45 +05:30
Nabin Hait
f6aad5ed2d
Distribute tax amount between items in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
aa87931172
Show only active BOM in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
fc155c7712
Added tax table in stock entry
2015-08-10 14:07:01 +05:30
Nabin Hait
8142cd2865
[fix] fifo in stock ledger
2015-08-05 18:57:37 +05:30
bobzz-zone
ff04bf6346
Update stock_entry.py
...
fixed for null expense account
2015-08-05 11:28:11 +07:00
Rushabh Mehta
5bd394278d
[fix] test-case, warehouse mandatory for mix type product bundle
2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813
[enhancement] auto insert item price if missing, #3533
2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975
[enhancement] make service type product bundle:
2015-08-04 14:47:45 +05:30
Anand Doshi
950250d444
Merge pull request #3793 from nabinhait/serial_no
...
Validate serial no in return entry with against document
2015-08-04 14:45:30 +05:30
Nabin Hait
b7c0c55d61
Validate serial no in return entry with against document
2015-08-04 12:18:12 +05:30
Nabin Hait
7edb951fdb
[fix] Get fifo rate only qty exists in batch
2015-08-04 11:09:14 +05:30
Nabin Hait
1755a5f298
[fix] get items from bom in material request
2015-08-03 19:18:21 +05:30
Rushabh Mehta
b16b9cd7a0
[fix] force stock_uom in item and stock ledger entry
2015-08-03 16:13:33 +05:30
Nabin Hait
b30c40ec8a
[fix] UOM conversion factor in stock entry
2015-07-31 19:48:57 +05:30
Rushabh Mehta
2f5587ab25
[fix] uom conversion factor in stock entry, #3734
2015-07-31 15:20:29 +05:30
Anand Doshi
2f443a5789
[hotfix] Item checkbox mandatory and removed Module Def Contacts
2015-07-30 14:44:43 +05:30
Nabin Hait
f33787a706
[fix] Get serial nos using FIFO in Return Delivery Note
2015-07-29 18:08:10 +05:30
Nabin Hait
763821d57d
Merge pull request #3746 from nabinhait/get_item_details
...
[fix] Get item details based on selected company
2015-07-29 16:02:39 +05:30
Nabin Hait
453cc374d4
- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice
...
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
2015-07-29 15:59:57 +05:30
Nabin Hait
e95c18a42d
Merge pull request #3744 from nabinhait/return
...
Sales / Purchase Return Improvements
2015-07-29 15:51:34 +05:30
Nabin Hait
18c2c54633
Merge pull request #3718 from rmehta/item-cleanup
...
[cleanup] yes/no selects changed to checks in Item
2015-07-29 15:49:54 +05:30
Nabin Hait
0edec9d25b
Merge pull request #3730 from nabinhait/fix1
...
minor fixes
2015-07-29 15:48:24 +05:30
Nabin Hait
15216fdd6f
[fix] Get item details based on selected company
2015-07-29 15:47:45 +05:30
Rushabh Mehta
8bf0b89595
[minor] currency field in list view for item price
2015-07-29 14:55:48 +05:30
Nabin Hait
746c162055
Return status in listview for return entry
2015-07-29 14:54:33 +05:30
Nabin Hait
1e046aa49a
Hide buttons for return entry
2015-07-29 13:16:37 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Nabin Hait
9088432f10
Fetch default expense account and cost center from item if company matches, otherwise fetch from company master
2015-07-28 11:16:22 +05:30
Nabin Hait
c80059e10e
[fix] Ignore making SLE for opening stock reco with zero qty
2015-07-28 11:16:22 +05:30
Nabin Hait
2b7eda8135
Merge pull request #3683 from nabinhait/return
...
Sales / Purchase Return Enhancement
2015-07-24 16:53:01 +05:30
Nabin Hait
6a09b3f7ef
Merge pull request #3702 from neilLasrado/capacity-planning
...
Global switch to set capacity planning in manufacturing
2015-07-24 14:26:28 +05:30
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f
[fix] Stock Entry permissions
2015-07-24 13:26:54 +05:30
Nabin Hait
061f7079ed
Test case for purchase return
2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122
Test cases for sales return
2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a
Minor fixes
2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663
Removed Sales/Purchase Return option from Stock Entry
2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096
Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
f965c5d203
now_datetime changed to nowdate
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
9c3dca63fa
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 13:14:56 +05:30
Neil Trini Lasrado
2771b7d828
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
2015-07-23 17:39:35 +05:30
Nabin Hait
2820a8749f
Merge pull request #3710 from neilLasrado/stock-report
...
Opening Balance row added to Stock Ledger Report
2015-07-23 15:21:26 +05:30
Neil Trini Lasrado
13df8a40ef
Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template
2015-07-23 12:46:59 +05:30
Neil Trini Lasrado
d0387f41df
Opening Balance row added to Stock Ledger Report
2015-07-22 18:44:59 +05:30
Anand Doshi
7590aa2524
[minor] raise EmptyStockReconciliationItemsError when no change in any of the items
2015-07-22 14:43:36 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
008d1a0334
Fixes in Stock Entry
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
fe2ffaeafa
Fixes in Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
700434ff37
has_variants made 'no copy' in Item Master
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
c70109d0c5
Item table made mandatory in Stock Reconciliation
2015-07-13 12:40:57 +05:30
Neil Trini Lasrado
5da4d857c9
Track Operations added to Production Order
2015-07-13 12:01:57 +05:30
Neil Trini Lasrado
cb4b2ec52a
Fixes in validate baatch function
2015-07-10 17:31:06 +05:30
Neil Trini Lasrado
03bf529622
Validation added to prevent adding items with expired batch numbers to stock ledger entry
2015-07-10 16:20:21 +05:30
Nabin Hait
db938762c7
[fix] Adding rows not allowed in Variant table in Manage Variants and Item form
2015-07-09 11:55:38 +05:30
Nabin Hait
e2b7f832cc
Test case fixed
2015-07-08 17:56:06 +05:30
Nabin Hait
736000c223
Merge pull request #3600 from neilLasrado/batch
...
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 16:10:21 +05:30
Nabin Hait
4017bfcd2e
Merge pull request #3591 from rmehta/salary-manager-fix
...
[fixes] salary manager #3554
2015-07-08 15:39:33 +05:30
Neil Trini Lasrado
ebb60f5dbc
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 15:24:02 +05:30
Nabin Hait
4439d8264f
minor fix
2015-07-08 14:32:56 +05:30
Nabin Hait
00d79eb68d
minor fix
2015-07-08 14:32:27 +05:30
Nabin Hait
28a9e35de9
Validate item rate with reference document with tolerance 0.009
2015-07-08 13:10:59 +05:30
Nabin Hait
c450536a2c
[fix] Map values in Debit / Credit Note from Stock Entry
2015-07-08 13:10:59 +05:30
Rushabh Mehta
f9b356992a
[fixes] salary manager #3554
2015-07-07 16:30:29 +05:30
Nabin Hait
0e6f92efa8
Merge pull request #3571 from neilLasrado/item-varients
...
Fixes for Item Attributes
2015-07-06 14:56:33 +05:30
Neil Trini Lasrado
1a0e86f11d
Update item_attribute.py
...
Error Description Changed
2015-07-06 14:46:06 +05:30
Nabin Hait
7b5ac6396a
Merge pull request #3575 from nabinhait/batch_report
...
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-06 14:30:23 +05:30
Neil Trini Lasrado
4d64acfafc
Autocomplete issues fixed in Manage Variants
2015-07-04 14:50:00 +05:30
Nabin Hait
24efb3122a
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-03 15:20:14 +05:30
Neil Trini Lasrado
1faaf71dfc
Auto-Capitalize Item Attribute Abbreation, Prevent attribute to be deleated if Variant exists
2015-07-03 12:44:01 +05:30
Nabin Hait
fcee17fd16
Removed purchase item validation
2015-07-02 17:51:35 +05:30
Rushabh Mehta
5105f909d6
[fix] show item description in form grid based on in_list_view
2015-07-02 15:09:18 +05:30
Neil Trini Lasrado
53bd62eafc
Validation changed for Item Template cannot have Stock
2015-07-02 14:15:23 +05:30
Neil Trini Lasrado
fe9cd1d875
More Fixes in Manage Varients
2015-07-01 14:41:30 +05:30
Neil Trini Lasrado
64fbe955c7
Modified Date changed for Item Doctype
2015-07-01 14:04:00 +05:30
Neil Trini Lasrado
0988440fd9
Fixes for Manage Variants
2015-07-01 13:17:15 +05:30
Neil Trini Lasrado
274dd4ada0
Fixed Manage Variants Attribute autocomplete appearance.
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
724fd82419
Fixes in Manage Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
3f2604eff6
Patch for Item Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
c761fefb78
more fixes in test records
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
203cb10ef7
fixes in test cases
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
90c66b1998
test cases added
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
fed431f908
Code Fixes in Manage Variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
bd9745ba72
Rename Item Variant from Manage Variants feature Added.
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
8fb123b20e
item variants, creation, deleation and update logic added.
...
logic added to copy changes in template to variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
333ccd212b
variants combination generation logic added
2015-07-01 12:51:10 +05:30
Neil Trini Lasrado
c8cc8b7115
manage variants new doctype created
2015-07-01 12:51:10 +05:30
Anand Doshi
0820161157
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-29 20:57:06 -07:00
Nabin Hait
93cdee4503
[fix] Escape values in queries
2015-06-27 12:51:00 +05:30
Neil Trini Lasrado
035160c9a6
Added validation to prevent transfer of raw material from an expired batch for manufacturing
2015-06-24 15:25:57 +05:30
Nabin Hait
9cf2910ba1
[fix] validate items in stock entry for subcontracting against purchase order
2015-06-23 11:07:34 +05:30
Nabin Hait
7ee45b4af2
[fix] Batch-wise balance history: show records only with batch-id
2015-06-18 15:29:14 +05:30
Rushabh Mehta
ed9d5cfdaf
[minor] cleanup
2015-06-17 02:13:03 +05:30
Rushabh Mehta
bf4547ca5f
[fix] dynamic link in BOM Search report
2015-06-17 02:12:06 +05:30
Rushabh Mehta
b45a6bcb88
[report] BOM Search
2015-06-17 01:54:56 +05:30
Anand Doshi
ac59c2b300
[minor] clear Item's introduction section on refresh
2015-06-16 13:06:48 -04:00
Nabin Hait
7c5ba957ac
Label changed for discount amount in base currency
2015-06-15 15:47:07 +05:30
Nabin Hait
5c7557914b
Removed BOM No from mandatory from Stock Entry against Production Order
2015-06-11 16:50:35 +05:30
Nabin Hait
b937fac3ce
[report] Warehouse column added in 'Ordered Items to be Delivered' report
2015-06-10 18:21:57 +05:30
Nabin Hait
a790ba05f4
[fix] Item name, description should not be overwritten on saving of stock entry
2015-06-09 18:42:52 +05:30
Neil Trini Lasrado
f64fae752f
fixes
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
82763f052f
Status Indicators fixed in Material Request List
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3
Barcode added to Purchase Receipt
2015-06-09 15:18:58 +05:30
Nabin Hait
ebbdd772a9
[fix] Validate and update manufactured qty in Stock Entry
2015-06-05 18:21:35 +05:30
Nabin Hait
6262496e70
[fix] item test case
2015-06-03 18:33:47 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Nabin Hait
4a6c178795
On selection of item, set default qty as 1
2015-06-01 14:01:56 +05:30
Anand Doshi
1b6c3f1a39
[fix] selenium test and changed Creation Document No to a Dynamic Link
2015-05-28 23:06:38 -04:00
Nabin Hait
10026ea85c
Merge pull request #3354 from rmehta/discount-field-relabel
...
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Anand Doshi
8860b9d94d
[fix] Check if company exists in re-order item. Fixes #3365 .
2015-05-28 01:09:21 -04:00
Pratik Vyas
f52b5ac8af
Merge pull request #3339 from rmehta/help
...
[help] added links in modules, added learn desktop module
2015-05-27 15:21:00 +05:30
Nabin Hait
eb00cae86c
Fiscal Year removed from Material Request
2015-05-27 13:18:09 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Rushabh Mehta
c7cfa270cd
[minor] add import link in item price
2015-05-26 14:07:05 +05:30
Rushabh Mehta
f29a618b69
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Rushabh Mehta
6771240471
[help] added links in modules, added learn desktop module
2015-05-25 18:31:08 +05:30
Nabin Hait
2c6705ef83
Merge pull request #3322 from nabinhait/test_case
...
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
4809d36fbe
validate fields value with reference docs
2015-05-25 14:13:03 +05:30
Rushabh Mehta
c4d38e2183
[minor] setup wizard language fix and no submit messages for gl/sl entry
2015-05-25 11:29:37 +05:30
Nabin Hait
fe8d107731
stock entry: get item details
2015-05-22 18:04:44 +05:30
Nabin Hait
e2968e9893
minor fixes in test cases
2015-05-22 17:25:55 +05:30
Nabin Hait
fd4bcd855b
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
1d08304ba5
added total row in stock balance report
2015-05-22 11:56:13 +05:30
Neil Trini Lasrado
753e40b4d5
fixes in validation for item varients
2015-05-21 14:38:58 +05:30
Nabin Hait
de7b87ee3a
[fix] operations and bom
2015-05-21 13:24:49 +05:30
Nabin Hait
4a929d53bc
Merge pull request #3310 from neilLasrado/item-var-validation
...
validation added to item varients
2015-05-21 13:21:21 +05:30
Nabin Hait
7f8d6b6252
Merge pull request #3303 from rmehta/letter-head-in-stock-entry
...
[enhancement] letter head in stock entry #3291
2015-05-21 13:20:26 +05:30
Neil Trini Lasrado
4258753ae8
validation added to item varients
2015-05-21 12:22:33 +05:30
Rushabh Mehta
a60984866c
[enhancement] letter head in stock entry #3291
2015-05-20 17:45:18 +05:30
Rushabh Mehta
a27cca97b5
[rename] POS Setting > POS Profile #3271
2015-05-20 15:43:17 +05:30
Pratik Vyas
803e998e9d
Fix merge mistakes
2015-05-19 13:08:54 +05:30
Pratik Vyas
1a84d8ecd2
Merge branch 'develop'
2015-05-19 12:23:52 +05:30
Nabin Hait
fb7140df2f
Don't repost future sle while cancelling PR via landed cost voucher
2015-05-19 11:12:06 +05:30
Rushabh Mehta
7231bd76a2
[minor] [fix] default status in Purchase Receipt
2015-05-18 14:36:57 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Nabin Hait
a6ee8290ce
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
2015-05-15 12:02:27 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
f6e4723101
minor fix in landed cost voucher
2015-05-13 12:53:11 +05:30
Nabin Hait
dd82bf2ad9
Exchange rate issue fixed
2015-05-11 16:49:31 +05:30
Nabin Hait
affb3ec220
Item variants: validation added
2015-05-11 15:11:17 +05:30
Nabin Hait
93e0ec6663
Show only sub-contracted purchase order in stock entry for subcontracting
2015-05-11 11:32:38 +05:30
Nabin Hait
d1a64d89be
date issue fixed serial no
2015-05-11 11:32:38 +05:30
Nabin Hait
6752b31091
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:43:10 +05:30
Nabin Hait
08c0c04ef2
Removed old page style Stock ledger end stock level report
2015-05-07 16:59:51 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Nabin Hait
64568fb296
Default expense account and cost center are always visible in item
2015-05-04 16:16:12 +05:30
Nabin Hait
f73aa079a0
item list view indicator fix
2015-05-04 16:06:59 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
67fdbcf242
precision fixed in batch-wise balance report
2015-04-28 12:53:26 +05:30
Nabin Hait
5ce31174be
precision fixed in batch-wise balance report
2015-04-28 12:36:53 +05:30
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Nabin Hait
52cf6e947c
patch fix
2015-04-24 16:07:32 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Rushabh Mehta
4665f7eb70
[enhancement] added description, batch_no in packing slip
2015-04-21 11:20:24 +05:30
Rushabh Mehta
0939a5ac4c
feature to delete company
2015-04-17 11:52:45 +05:30
Rushabh Mehta
53bc304be2
Merge pull request #3037 from neilLasrado/production-planning
...
Production planning
2015-04-15 12:06:44 +05:30
Rushabh Mehta
3ee1f11771
[cleanup] quality inspection fixes #3061
2015-04-14 17:53:36 +05:30
Neil Trini Lasrado
cf96cc26a0
Fixes for test cases
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe
fix- Material Transferred for Manufacturing not Updating in Production Order Error
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
2015-04-14 13:00:54 +05:30
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Anand Doshi
c994647704
fixed test cases
2015-04-08 21:22:36 +05:30
Nabin Hait
0277ae298a
pending amount to be delivered in report
2015-04-07 17:49:53 +05:30
Nabin Hait
6eb55d4d3d
allowed import for delivery note
2015-04-07 09:42:44 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
22af7deadd
minor fixes
2015-04-05 17:18:07 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Nabin Hait
54c865e77c
Landed cost voucher: fixes for serialized item
2015-03-27 15:39:06 +05:30
Nabin Hait
789ef7e346
stock balance report fixed
2015-03-26 17:40:57 +05:30
Rushabh Mehta
308e6ea21e
[fixes] default_website and stock reco
2015-03-24 17:35:16 +05:30
Rushabh Mehta
fea22de3e8
[minor] material request and newsletter list
2015-03-23 15:44:54 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Nabin Hait
97cc4dd582
precision issue fixed in report
2015-03-23 13:10:50 +05:30
Nabin Hait
544af6d4cf
fix
2015-03-23 12:35:39 +05:30
Nabin Hait
63e00dcfd2
Set qty as per stock_uom while mapping Material request to Purchase order
2015-03-20 16:25:53 +05:30
Nabin Hait
2ed71bac20
Batch related cleanup
2015-03-20 15:06:30 +05:30
Nabin Hait
5601d9fbda
match condition in get_query
2015-03-20 14:40:36 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Nabin Hait
fd2bf93b50
test case fix
2015-03-18 17:56:09 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Nabin Hait
60aee54c6c
currency in test records
2015-03-18 16:06:13 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Neil Trini Lasrado
adb1b2ccef
fix - price list none is disabled error if price list is made blank in purchase order
2015-03-18 11:41:58 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de
test case fixed
2015-03-17 10:15:19 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Neil Trini Lasrado
6f272f2f53
fixes in Production Order
2015-03-12 17:51:06 +05:30
Sambhaji Kolate
845f1c636e
code cleanup
2015-03-10 15:19:29 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
c0eb8c0de3
Fixed some Stock Entry test cases
2015-03-08 12:42:18 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Rushabh Mehta
0c677aa151
fix #2847
2015-03-04 12:32:59 +05:30
Nabin Hait
652c7db6e8
Stock entry fixes: incoming rate, toggle display of bom related fields
2015-03-03 18:33:34 +05:30
Rushabh Mehta
e693f794f5
[subcontract] refactor, make stock entry from PO
2015-03-03 15:50:24 +05:30
Nabin Hait
56c6a65a22
argument name fix in sendmail
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
43ba7e1a30
allow negative stock issie fixed
2015-03-03 14:07:21 +05:30
Rushabh Mehta
1758357a0a
[item] toggle reqd, fixes #2832
2015-03-03 11:08:22 +05:30
Rushabh Mehta
b83fa3bc2d
[pos] [barcode] fixes #2831
2015-03-02 18:25:14 +05:30
Nabin Hait
b7ae9b4283
Merge pull request #2866 from neilLasrado/barcode
...
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Nabin Hait
851c745fdf
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
2015-02-26 12:32:04 +05:30
Nabin Hait
98a8fae7c2
hotfix for fetching default account and warehouse
2015-02-26 11:37:07 +05:30
Neil Trini Lasrado
4abda67a98
Barcode added to stock entry
2015-02-25 19:01:17 +05:30
Nabin Hait
69d874e7d7
Merge pull request #2864 from neilLasrado/delivery-note
...
Delivery note - Batch Id made Link Feild
2015-02-25 18:37:17 +05:30
Rushabh Mehta
a8a2fb225d
[fixes] item, test site install
2015-02-25 17:32:22 +05:30
Rushabh Mehta
66a92792b4
[fix] default account for manufacturing stock entry should be cogs
2015-02-25 17:15:45 +05:30
Rushabh Mehta
2a21bc9fc2
[taxes and charges] refactor
2015-02-25 15:08:57 +05:30
Rushabh Mehta
e91388381c
[minor] notifications and other fixes to stock
2015-02-25 15:08:57 +05:30
Anand Doshi
d75ef108fc
Allow user to change page_name in Item and Item Group #2397
2015-02-25 13:50:14 +05:30
Neil Trini Lasrado
b9ff7186ed
batch field changed to link feild in packed_item
2015-02-25 12:44:45 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
da858cc587
Website Product Image
2015-02-24 17:52:09 +05:30
Rushabh Mehta
b620fed762
[fixes] [minor]
2015-02-24 16:51:22 +05:30
Nabin Hait
7ce2f55ca9
print_hide for total_taxes_and_charges in buying
2015-02-24 16:06:14 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Rushabh Mehta
99d0941008
[time logs] fixes
2015-02-24 14:48:11 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02
minor fixes
2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
34afcfb4a1
Print without amount in delivery note
2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
d06c1188a0
[item] patches
2015-02-23 14:43:15 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
65a2759432
[minor] opportunity / item
2015-02-21 17:35:50 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
dc93e0adc6
[fixes] stock reco
2015-02-20 15:11:56 +05:30
Nabin Hait
ad3fd5166b
update stock uo in sle for DN
2015-02-20 14:23:58 +05:30
Sambhaji Kolate
973f78e7d3
fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802
2015-02-20 13:09:39 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Rushabh Mehta
8bb6e530c7
[fixes] accounts, stock changes
2015-02-18 20:22:59 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Rushabh Mehta
4ea1ade7b9
[hub] start
2015-02-18 19:09:56 +05:30
Nabin Hait
06fd10620e
Merge pull request #2734 from neilLasrado/kill-html-desc
...
Kill html desc -WIP
2015-02-18 13:13:52 +05:30
Nabin Hait
5fd1727acd
Merge pull request #2752 from neilLasrado/stock-amount
...
client side - recalculate amount and total amount on change of qty or va...
2015-02-18 13:11:41 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
7f70367dde
image view fixed for stock entry and bom
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
3361df709c
Image field and view added to all stock doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
c48f06c095
Image field and view added to all selling doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9
html item desc removed from item master, item image added in oppurtunity
2015-02-18 12:32:37 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Neil Trini Lasrado
b2c521847e
fixes
2015-02-18 12:07:09 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Neil Trini Lasrado
3efc6ab94d
fixes
2015-02-18 11:51:09 +05:30
Neil Trini Lasrado
9aafe76f63
client side - recalculate amount and total amount on change of qty or valuation reate of the item
2015-02-18 11:51:09 +05:30
Rushabh Mehta
2e0e711eb2
[minor] stock_ledger_entry.py
2015-02-18 11:38:48 +05:30
Rushabh Mehta
df9e80c87a
[refactor] stock entry, minor ux
2015-02-17 19:56:04 +05:30
Rushabh Mehta
0fb678e7cf
[stock reco] cleanups
2015-02-17 19:56:04 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Nabin Hait
7945195478
Merge pull request #2761 from neilLasrado/update-finished-goods-fix
...
Update finished goods fix
2015-02-17 14:21:41 +05:30
Nabin Hait
13e6ac737f
Merge pull request #2748 from neilLasrado/get-prod-order
...
fixes in stock entry
2015-02-17 14:12:00 +05:30
Nabin Hait
133b7ed218
Merge pull request #2743 from neilLasrado/price-list
...
Price list name made - 'no copy'
2015-02-17 14:08:18 +05:30
Rushabh Mehta
2712e36f08
[stock reco] added items table
2015-02-17 12:50:20 +05:30
Rushabh Mehta
06072c1e51
[refactor] Material Transfer for Manufacture
2015-02-17 11:50:45 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Nabin Hait
b09ed41c52
Fetch default accounts, cost center only if company matches with the transactions
2015-02-17 10:34:17 +05:30
Rushabh Mehta
36b84408a8
[fixes] precision in purchase receipt and item group route
2015-02-16 18:26:38 +05:30
Neil Trini Lasrado
35898d7518
Update finished goods fix
2015-02-16 17:25:28 +05:30
Neil Trini Lasrado
4d4c643b7e
fixes in stock entry
2015-02-13 13:09:17 +05:30
Neil Trini Lasrado
62885b3c56
Price list name made -no copy
2015-02-12 17:41:20 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-12 13:31:48 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Neil Trini Lasrado
daaf5814fa
landed cost voucher fix
2015-02-11 16:23:46 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Neil Trini Lasrado
845be908d6
function moved to validate
2015-02-06 16:15:45 +05:30
Neil Trini Lasrado
8fd3828ef5
Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master
2015-02-06 16:09:55 +05:30
Anand Doshi
9b30a8626c
[minor] removed default filters for sales order and material request, fixed pos css
2015-02-06 12:30:08 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Nabin Hait
e0ce9407cb
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:12:37 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Neil Trini Lasrado
14e24a947b
fixes for batch validations
2015-02-03 18:23:46 +05:30
Neil Trini Lasrado
9448aaf2a6
validation added in stock entry
2015-02-03 18:09:56 +05:30
Neil Trini Lasrado
75e0f0a153
batch list view fix:
2015-02-03 17:41:11 +05:30
Nabin Hait
7e333c6a31
Merge pull request #2596 from neilLasrado/item-in-bom
...
allow bom field removed from Item Master
2015-02-02 16:33:46 +05:30
Rushabh Mehta
052bd624c1
[minor] removed company description and don't call apply_price_list if no items
2015-01-30 16:57:24 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
79dc136d50
default target warehouse for subcontract
2015-01-29 12:51:17 +05:30
Nabin Hait
238fd68803
Minor fix
2015-01-28 14:30:03 +05:30
Anand Doshi
6f701b3b6a
[minor] Packing Slip get_query
2015-01-27 13:18:01 +05:30
Nabin Hait
4ccd8d3326
Allow nagative batch balance from landed cost voucher
2015-01-23 12:18:14 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Nabin Hait
9c47efb592
Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts
2015-01-21 16:22:45 +05:30
Nabin Hait
3f671ea60f
Landed Cost Voucher: Add field and fixed reposting issue
2015-01-21 14:08:06 +05:30
Neil Trini Lasrado
c784fa219b
commit
2015-01-19 17:05:05 +05:30
Neil Trini Lasrado
f37a5ddff5
allow bom field removed from Item Master
2015-01-19 17:05:05 +05:30
Nabin Hait
cff8993478
Merge pull request #2572 from neilLasrado/credit-note
...
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
6609938483
Removed validation: target_valuation > source_valuation
2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
45a5d52a2a
minor changes in packing slip
2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
9235c6d65a
update stock_entry.py
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
50763d58ce
frappe.db.exist used
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c
journal entry linked and validation added
2015-01-14 11:54:55 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Nabin Hait
675276b802
valuation rate mandatory if item is transacting for the first time
2015-01-10 10:27:28 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
a17d7cea34
test records fixed
2015-01-07 15:42:59 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8
[design] POS - item grid and taxes
2015-01-05 16:19:12 +05:30
Nabin Hait
0938b5dec6
FG item and raw material can not be merged
2015-01-02 15:12:30 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
a4e547d71d
minor fix
2014-12-31 12:08:13 +05:30
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
b0b7e7fdf8
Merge pull request #2497 from neilLasrado/batch-redesign
...
batch redesigned
2014-12-23 17:44:41 +05:30
Nabin Hait
89c52eacc7
Actual operation cost in stock entry, fixed cost removed from bom and workstation
2014-12-23 17:39:00 +05:30
Nabin Hait
da4e3fb366
fixed negative batch wty message
2014-12-23 10:58:01 +05:30
Nabin Hait
a04489a72b
minor fix no-copy
2014-12-22 14:58:36 +05:30
Nabin Hait
e4c659386a
packing list index
2014-12-16 15:16:55 +05:30
Nabin Hait
0f2137be18
no copy property for customer's po no
2014-12-16 10:37:55 +05:30
Neil Trini Lasrado
26320fc755
batch redesigned
2014-12-15 17:42:33 +05:30
Nabin Hait
ad0bd4ca92
Pull all customer's po no in delivery note when made from multiple sales order
2014-12-12 12:49:45 +05:30
Nabin Hait
a94478a618
Merge pull request #2390 from ankitjavalkarwork/fix2314
...
Add selectable BOM field for Subcontracted Item
2014-12-11 17:41:45 +05:30
ankitjavalkarwork
5edae0e47b
[ #2314 ] Add selectable BOM field for Subcontracted Item
2014-12-04 15:54:54 +05:30
Rushabh Mehta
969069fbf9
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Nabin Hait
789b74257e
test case fixes
2014-11-27 15:22:24 +05:30
Nabin Hait
40fffc0f4d
fixes during testing version 5
2014-11-26 15:43:27 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
9ed41b3abb
Reordered Item fields
2014-11-26 10:54:11 +05:30
Nabin Hait
db74e316d2
Validate serial no after auto-creation based on naming series
2014-11-24 15:25:13 +05:30
Nabin Hait
2c114b5bb5
Merge pull request #2407 from ankitjavalkarwork/packingsliphead
...
Add letterhead field and mapper in Packing Slip
2014-11-14 14:50:28 +05:30
ankitjavalkarwork
f60f111afe
Add letterhead field and mapper in Packing Slip
2014-11-13 17:28:42 +05:30
ankitjavalkarwork
338eb36811
[ #2219 ] Re-Order Level Validation: Warehouse cannot have two reorders for same item
2014-11-11 13:59:46 +05:30
Nabin Hait
f004077734
Map only pending qty from Material Request to Purchase Order/Stock Entry
2014-11-11 10:51:41 +05:30
Neil Trini Lasrado
6bde5868a9
Test Cases Fixed
2014-11-05 16:34:02 +05:30
Neil Trini Lasrado
6d8f48ff8d
Test Cases Added - Work Pending
2014-11-05 15:57:06 +05:30
Neil Trini Lasrado
f9ced8f28f
test-cases added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
67e9081bbf
required modifications done
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
ce020cfb27
mapper added, type 'Transfer' renamed to 'Material Transfer', patch added
2014-11-05 15:46:32 +05:30
Neil Trini Lasrado
f24407e119
Material Issue added to Material Request Type
2014-11-05 15:46:32 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
f73a7c1d17
Merge pull request #2376 from ankitjavalkarwork/fix2287
...
Delete Item Price on deletion of linked Item
2014-11-05 11:44:18 +05:30
Nabin Hait
941a965af4
Ordered qty calculation logic
2014-11-04 15:34:03 +05:30
Nabin Hait
4acd431b92
Requested qty calculation logic
2014-11-04 15:34:03 +05:30
ankitjavalkarwork
a03eda54a2
Delete Item Price on deletion of linked Item
2014-11-03 16:00:28 +05:30
Nabin Hait
0d421c1bf1
Minor fixes
2014-11-03 15:46:15 +05:30
Nabin Hait
11e50a8eee
Merge pull request #2366 from ankitjavalkarwork/fixprinthideamt
...
Hide totals in DN, Auto set Bank/Cash acc. in JV
2014-11-03 15:38:45 +05:30
Nabin Hait
5288bdeabb
Minor fix
2014-11-03 15:08:21 +05:30
ankitjavalkarwork
6e06357dc5
Hide totals on checking print_without_amount field in DN
2014-11-03 11:57:44 +05:30
Rushabh Mehta
98ae5bd9db
[form] show website link for website generator
2014-10-31 14:28:47 +05:30
Neil Trini Lasrado
0683fc33ed
Fix error in get_default_cost_center() function
2014-10-22 14:51:37 +05:30
Nabin Hait
16e05c321c
Removed stock ageing grid report
2014-10-22 13:10:43 +05:30
Nabin Hait
23d7919865
Stock ageing report fix
2014-10-22 13:06:26 +05:30
Nabin Hait
38265efc39
Minor fix
2014-10-21 20:23:39 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35
Merge pull request #2231 from rmehta/item-variants
...
Item variants
2014-10-21 12:38:16 +05:30
Nabin Hait
fc2dd44694
Partial payment reconciliation. Fixes #1982
2014-10-17 14:57:20 +05:30
Nabin Hait
f1a07ff105
Allow zero rate while reposting
2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315
Guess valuation rate in case of negative stock
2014-10-15 11:34:40 +05:30
Nabin Hait
0dc18f0102
Minor fixes
2014-10-14 17:15:02 +05:30
Nabin Hait
bf492122f8
minor fix
2014-10-14 16:09:14 +05:30
Nabin Hait
38d0ed9f3a
Negative stock allowed for perpetual inventory. Blocked in specific case
2014-10-14 16:08:19 +05:30
Nabin Hait
8a28ccfa2f
Repost gl entries where mismatch with stock balance
2014-10-14 11:41:56 +05:30
Nabin Hait
daf344e5fd
Precision fixed in batch-wise balance report
2014-10-13 10:48:26 +05:30
Nabin Hait
70ec88b733
fixed test cases
2014-10-10 21:22:46 +05:30
Nabin Hait
4f0e5db216
Stock balance grid report deprecated and moved to server side
2014-10-10 20:54:57 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
Nabin Hait
7c6f990cf9
Minor fix for moving average
2014-10-10 18:03:27 +05:30
Nabin Hait
7820b171d3
Stock balance grid report deprecated and moved to server side
2014-10-10 18:03:07 +05:30
Nabin Hait
4d74216147
Maintain negative stock balance if balance qty is negative
2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d
[ #2164 ] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
Nabin Hait
e96e83d557
stock reco and repost vouchers
2014-10-08 18:06:14 +05:30
Rushabh Mehta
ebc6016ffb
[tests] fixes
2014-10-08 13:54:19 +05:30
Rushabh Mehta
7472a1147c
[tests] fixes
2014-10-08 12:41:06 +05:30
Rushabh Mehta
f850987db0
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:03:19 +05:30
Nabin Hait
6c48ef781b
Utility: Repost stock ledger entries and gl entries for all stock transactions
2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b
Block negative stock in perpetual inventory
2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9
stock reco fixes
2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd
Stock reconciliation sl entries
2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf
Stock Reconciliation logic simplified
2014-10-08 11:02:18 +05:30
Rushabh Mehta
b31e90c7a5
[tests] fixes to stock entry
2014-10-07 16:56:46 +05:30
Rushabh Mehta
db08041f05
[fix] remove test for item attribute value
2014-10-07 15:39:35 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
Rushabh Mehta
baef96b5a2
[item-variants] allow production order of variant #2224
2014-10-07 12:34:19 +05:30
Rushabh Mehta
1a7637459c
[item-variants] added more validations, tests #2224
2014-10-07 11:40:47 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Rushabh Mehta
9974b16c32
[fix] packing slip
2014-10-07 10:52:05 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +05:30
Nabin Hait
894a1b539a
Dynamic link in general ledger and stock ledger report
2014-10-06 13:14:22 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
ankitjavalkarwork
e9877a0c48
[fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report
2014-10-01 18:07:25 +05:30
Nabin Hait
4f614b4030
Merge pull request #2195 from neilLasrado/manufacture-and-repack
...
[fix] Issue #2183 - Manufacturing and repack seprated in stock entry
2014-09-30 15:11:05 +05:30
Neil Trini Lasrado
29d1a1c593
manufacturing and repack sepreted, test cases fixed, patch fixed
2014-09-30 14:07:56 +05:30
Neil Trini Lasrado
3b90de558f
Has Batch No field should be freezed #2023
2014-09-30 12:57:32 +05:30
Rushabh Mehta
86211cd219
Merge pull request #2203 from rmehta/mailbox
...
Mailbox
2014-09-29 14:18:10 +05:30
Rushabh Mehta
39764685f0
[fix] material request feed
2014-09-29 13:00:36 +05:30
Rushabh Mehta
e1509162e1
[fix] material request feed
2014-09-29 12:53:53 +05:30
Rushabh Mehta
66e08e39f7
[fix] currency moved to frappe
2014-09-29 12:17:03 +05:30
Nabin Hait
d60235e239
minor fix in warehouse-wise stock balance report
2014-09-29 11:36:06 +05:30
Nabin Hait
9b50b0a762
Fixes for item list view
2014-09-29 11:36:06 +05:30
Nabin Hait
5e080f9039
Update utils.py
2014-09-26 15:05:30 +05:30
Nabin Hait
b0bd99266d
Fix in landed cost voucher
2014-09-26 14:30:02 +05:30
ankitjavalkarwork
9aa11d2ad7
Add ability to fetch Non stock items in Gross Profit report
2014-09-18 19:08:04 +05:30
Anand Doshi
11b75759d2
Merge pull request #2194 from ankitjavalkarwork/stockbalreport
...
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Anand Doshi
8950abc36f
Merge pull request #2197 from anandpdoshi/anand-september-15
...
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Nabin Hait
ca260618d8
Minor fix
2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398
[minor] removed Suggest
2014-09-15 16:43:34 +05:30
81552433qqcom
ac0c3fb696
#2190 hotfix, item page
2014-09-15 10:21:36 +08:00
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42
translations.
2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Neil Trini Lasrado
e9882e12ba
Cost of Production cycle
2014-09-12 11:25:03 +05:30
ankitjavalkarwork
2e07305616
Update report with Valuation rate, stock values, move to Main report
2014-09-11 16:47:19 +05:30
Anand Doshi
907494c5d4
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:22:12 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
dc79334f1c
[fix] Clear website cache for Item Group on saving Item
2014-09-09 12:35:15 +05:30
Nabin Hait
ff7e9b6b22
Get items in PO from material requests based on supplier
2014-09-09 11:01:55 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
Nabin Hait
0f798dda15
Valuation rate for finished goods in repack entries
2014-09-04 15:21:46 +05:30
Nabin Hait
629e51a8e9
Search field fixed in stock entry
2014-09-04 15:21:46 +05:30
Nabin Hait
a84f3663dd
removed test records for landed cost voucher
2014-09-02 23:11:06 +05:30
Nabin Hait
96bdc5834c
Get valuation rate in manufacturing/repack entry
2014-09-02 20:02:25 +05:30
Nabin Hait
9e563e7b47
Stock reconciliation when valuation rate column is blank
2014-09-01 18:16:24 +05:30
Nabin Hait
12ce3eefca
landed cost voucher added in module page
2014-09-01 18:16:24 +05:30
Anand Doshi
40a8ae2907
[fix] get incoming rate
2014-08-29 16:28:31 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Neil Trini Lasrado
9d1e8b61fe
[Fix] Issue #980 final
2014-08-25 19:04:30 +05:30
Neil Trini Lasrado
d676491b6e
Merge https://github.com/frappe/erpnext into item_group
2014-08-25 16:18:31 +05:30
Neil Trini Lasrado
caba531e89
[fix] issue#980
2014-08-25 13:22:15 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d
remove website route, wip
2014-08-20 11:43:58 +05:30
Anand Doshi
cca6460e65
[fix] Error Reports
2014-08-19 16:06:09 +05:30
Anand Doshi
6ab831b387
Allow Default Warehouse for Item, even if not a Stock Item
2014-08-18 19:04:19 +05:30
Nabin Hait
448c9b71c1
minot fix in material request
2014-08-18 15:40:36 +05:30
Pratik Vyas
c0d31ce648
Merge pull request #2062 from nabinhait/hotfix
...
Hotfix
2014-08-15 11:06:44 +05:30
Anand Doshi
eb39435481
[hotfix] Allow on submit for Projected Qty
2014-08-14 18:08:19 +05:30
Nabin Hait
54498452b6
Stock entry minor fix
2014-08-14 15:49:44 +05:30
Nabin Hait
821aad5281
Sales/purchase return: fixes for qty validation
2014-08-14 15:15:14 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
f957cbd8ef
[test] Purchase Receipt - update rejected serial no
2014-08-11 18:03:43 +05:30
Nabin Hait
5c0db8d05e
Landed Cost voucher test case for serialized items
2014-08-11 16:28:29 +05:30
Nabin Hait
200e8d971f
Landed Cost voucher test case for serialized items
2014-08-11 16:12:32 +05:30
Nabin Hait
a97e700371
Add rejected serial nos in Purchase Receipt if auto-created based on series
2014-08-11 16:12:32 +05:30
Nabin Hait
2b776e8c3a
Landed cost voucher minor fixes
2014-08-11 16:12:32 +05:30
Nabin Hait
f3e1181ad9
Landed cost voucher fixes
2014-08-11 16:12:32 +05:30
nabinhait
9cbcf96aeb
no copy property for landed cost voucher amount field
2014-08-11 16:12:32 +05:30
nabinhait
8ca3189f07
pr and pi gl entries
2014-08-11 16:12:31 +05:30
nabinhait
98e7dcfe2c
landed cost voucher minor fix
2014-08-11 16:12:31 +05:30
nabinhait
cfd1b10980
Purchase receipt gl entries if there is warehouse without account
2014-08-11 16:12:31 +05:30
nabinhait
f807cda375
PR and PI gl entries fixes for landed cost
2014-08-11 16:12:31 +05:30
nabinhait
11594c7927
purchase receipt gl entries
2014-08-11 16:12:31 +05:30
nabinhait
509aa52efc
minor fix
2014-08-11 16:12:31 +05:30
nabinhait
e2c3f7ab14
Added help in landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
fe39442c48
Removed old landed cost wizard
2014-08-11 16:12:31 +05:30
nabinhait
b21b6598f1
Test case for landed cost voucher
2014-08-11 16:12:31 +05:30
nabinhait
5e1b0014c2
GL entries for sub-contracting and rejected qty
2014-08-11 16:12:31 +05:30
nabinhait
cc0692d714
landed cost fix
2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e
Landed Cost on_submit and gl entries for PR
2014-08-11 16:12:31 +05:30
nabinhait
f6ea21c8ae
landed cost voucher design changed #1921
2014-08-11 16:12:30 +05:30
nabinhait
4436157da1
Landed cost redesign initial commit #1921
2014-08-11 16:12:30 +05:30
Anand Doshi
b00a2422e4
[hotfix] Allow on Submit - Actual / Projected Qty for Packed Item
2014-08-11 15:54:20 +05:30
Anand Doshi
42335fb2cb
[minor] Allow on Submit - Actual / Projected Qty
2014-08-11 13:28:29 +05:30
Anand Doshi
52d1ea83a0
[hotfix] Stock Entry List
2014-08-11 09:16:59 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a
added templates for projects
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19
added more listview templates
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Nabin Hait
67cd3fb89c
Fixes in making credit note from Sales Return
2014-08-07 15:34:53 +05:30
Anand Doshi
29817d6d8b
[print] Moved Total Taxes and Charges to the right column
2014-07-31 16:05:19 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
nabinhait
0ad677045a
Test record fixed for warehouse
2014-07-31 11:40:40 +05:30
nabinhait
c1f65dd863
Validation: Account must belong to the same company
2014-07-31 11:40:40 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
60ee2ea8af
[hotfix] Stock Entry search fields
2014-07-29 23:16:24 +05:30
Anand Doshi
0e93352c8d
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 22:03:40 +05:30
nabinhait
92a1e06665
message fix
2014-07-29 12:46:56 +05:30
nabinhait
7555d619f2
Message for frozen stock entries
2014-07-29 11:35:41 +05:30
nabinhait
0a35277c96
Stock reconciliation only for valuation
2014-07-28 16:41:34 +05:30
nabinhait
3d48a4ef65
Sales / purchase return: Get party details fix
2014-07-28 16:41:33 +05:30
nabinhait
957971eb1d
Column added 'Reqd by Date' in po_items_to_be_billed report
2014-07-28 16:41:33 +05:30
Anand Doshi
62b1cbf003
[impact] Limit available functions in jinja environment
2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Anand Doshi
4c5d7617fb
[minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form
2014-07-21 18:02:22 +05:30
Rushabh Mehta
1c6313679b
Update material_request.js
2014-07-21 13:08:49 +05:30
Anand Doshi
d141cf7293
Minor fix in reorder item
2014-07-18 10:31:34 +05:30
Anand Doshi
e8332be285
Merge pull request #1949 from anandpdoshi/anand-july-17
...
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
fa0db761da
Fix in Stock Entry test case
2014-07-17 12:30:55 +05:30
nabinhait
d16081c4d9
Batch no get query fix
2014-07-17 11:08:19 +05:30
nabinhait
143400d444
Batch no get query fix
2014-07-17 11:00:13 +05:30
Anand Doshi
b8189d7d23
Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified
2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067
Fixes in Stock Entry test cases
2014-07-16 19:23:58 +05:30
Anand Doshi
d93fa2f78b
Fixes in Stock Entry and test cases
2014-07-16 16:08:15 +05:30
nabinhait
d5fd535909
Minor fix, if no default company
2014-07-14 12:39:50 +05:30
nabinhait
614fb750b7
set qty as per stock uom in entire purchase cycle
2014-07-14 10:48:12 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
Anand Doshi
a96cf5b96b
Print Hide other charges calculation
2014-07-10 12:16:39 +05:30
nabinhait
89b5e3e2ea
Set discount zero while fetching price list rate
2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
e729516af7
Minor fix
2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c
Catch FiscalYearError in Re-order Item
2014-07-07 15:21:18 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
nabinhait
23cce731ab
Fixes in action, not defined if called from outside document class
2014-07-03 12:25:06 +05:30
Prakash Hodage
c01f4582de
Description removed for default cost center
2014-07-03 10:50:35 +05:30
Anand Doshi
e673a664ac
Fixes to end_of_life conditions
2014-07-02 18:15:01 +05:30
Anand Doshi
8ac4643fd7
Merge pull request #1867 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-30 13:20:49 +05:30
Anand Doshi
c459fe21f8
Merge pull request #1865 from frappe/wip-4.1
...
Wip 4.1
2014-06-30 12:00:55 +05:30
Nabin Hait
606c601fc0
Make debit/credit note from sales/purchase return
2014-06-30 11:50:17 +05:30
Nabin Hait
7c9652997b
Item website specification from item group
2014-06-30 11:50:17 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Nabin Hait
a0a18d963d
item query fixed in stock entry
2014-06-27 13:04:22 +05:30
Nabin Hait
b7e91ee95e
with_doc issue fixes
2014-06-26 15:54:45 +05:30
Anand Doshi
f1af06c00d
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-26 15:05:42 +05:30
Nabin Hait
4a1c897b2d
Select field options in serial no
2014-06-26 12:35:14 +05:30
Anand Doshi
5263b1a9c1
Merge remote-tracking branch 'frappe/develop' into wip-4.1
2014-06-25 17:06:51 +05:30
Nabin Hait
2b400dc2ad
stock entry incoming rate based on precision
2014-06-25 16:57:49 +05:30
Anand Doshi
8b2dfcff29
Naming Series Property Setter Patch
2014-06-25 16:57:49 +05:30
Nabin Hait
061c9744af
Set status button in serial no
2014-06-25 16:57:48 +05:30
Nabin Hait
43616619ec
Set status button in serial no
2014-06-25 16:57:48 +05:30
Nabin Hait
9daca108b3
Pricing Rule fixes and improvements. Fixes #1795
2014-06-25 16:57:47 +05:30
Nabin Hait
c5e813f9f4
Overwrite from POS Settings if value exists
2014-06-25 16:57:07 +05:30
Nabin Hait
3b7dd0396f
Get party details fixes
2014-06-25 16:57:07 +05:30
Nabin Hait
c226292d8e
Stocvk entry incoming rate for sales return
2014-06-25 16:57:07 +05:30
Nabin Hait
216e5bb208
Incoming rate for sales return
2014-06-25 16:57:07 +05:30
Nabin Hait
afdc0a5f59
Valuation rate and amount for fg item
2014-06-25 16:57:07 +05:30
Anand Doshi
222b7b660e
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-25 16:57:06 +05:30
Anand Doshi
a469954ef3
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
...
This reverts commit 297939325a
.
2014-06-25 16:57:06 +05:30
Anand Doshi
457515fc08
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-25 16:57:05 +05:30
Anand Doshi
e3ac8dd5a8
Don't set default for warehouse when creating serial no
2014-06-25 16:57:05 +05:30
Nabin Hait
cea571fc31
Fixes in fetching valuation rate in stock entry
2014-06-25 16:57:03 +05:30
Nabin Hait
7c6c2e0ccf
Do not make packing list after submission
2014-06-25 16:57:02 +05:30
Anand Doshi
a740f750c7
Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return
2014-06-25 13:31:02 +05:30
Anand Doshi
610a405c85
Fix in warehouse query
2014-06-25 13:30:26 +05:30
Anand Doshi
e0a7ff77df
Merge pull request #1838 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
fdf38dab6f
stock entry incoming rate based on precision
2014-06-24 12:42:36 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Nabin Hait
da490e3f53
Set status button in serial no
2014-06-23 15:51:03 +05:30
Nabin Hait
36da171a3d
Set status button in serial no
2014-06-23 15:36:31 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Nabin Hait
faf176d78c
Overwrite from POS Settings if value exists
2014-06-18 19:52:24 +05:30
Nabin Hait
4d7c4fc0f4
Get party details fixes
2014-06-18 16:40:59 +05:30
Nabin Hait
e7c2f74a07
Stocvk entry incoming rate for sales return
2014-06-18 16:40:59 +05:30
Nabin Hait
a7da6e1480
Incoming rate for sales return
2014-06-18 16:40:59 +05:30
Nabin Hait
ae0d753cad
Valuation rate and amount for fg item
2014-06-18 16:40:59 +05:30
Anand Doshi
de12a0941f
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-18 14:05:29 +05:30
Anand Doshi
987a28fc6a
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
...
This reverts commit 297939325a
.
2014-06-18 14:05:08 +05:30
Anand Doshi
297939325a
Stock Entry: get fg item incoming rate if bom is mentioned
2014-06-18 13:10:10 +05:30
Anand Doshi
2f800521cb
Don't set default for warehouse when creating serial no
2014-06-18 12:48:46 +05:30
Nabin Hait
0693937c1e
Fixes in fetching valuation rate in stock entry
2014-06-18 10:20:01 +05:30