rohitwaghchaure
69279229cc
Merge pull request #8987 from bcornwellmott/bom_convert_uom
...
Added BOM UOM selection for items
2017-06-28 16:28:31 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
bcornwellmott
6561b8ade9
Merge branch 'develop' into bom_convert_uom
2017-06-16 08:29:00 -07:00
tundebabzy
9a3462031d
[UX] Error in purchase transaction - Ignore instead of Prompt #7766 ( #9329 )
...
* sets tax category to "Total" if all items are non-stock items
* makes notification message translatable and removes multi-line string
* Update buying_controller.py
2017-06-16 15:30:14 +05:30
Rushabh Mehta
c8a0de5e59
Revert "sets tax category to "Total" if all items are non-stock items ( #9295 )" ( #9320 )
...
This reverts commit 476c4fec1d
.
2017-06-16 11:18:23 +05:30
tundebabzy
476c4fec1d
sets tax category to "Total" if all items are non-stock items ( #9295 )
2017-06-16 11:17:40 +05:30
Rushabh Mehta
e0434ad40e
Merge branch 'develop' into bom_convert_uom
2017-06-15 17:32:27 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
Sagar Vora
847444724b
remove bracket ( #9284 )
2017-06-14 15:51:47 +05:30
Sagar Vora
d19c2e2e93
[minor] Check if item is stock item before validating Warehouse while Purchase Return ( #9282 )
...
* Check if item is stock item before validating Warehouse
* changed logic to decide warehouse_mandatory
2017-06-14 15:39:41 +05:30
bcornwellmott
5491275b66
Merge branch 'develop' into bom_convert_uom
2017-06-07 08:42:54 -07:00
tundebabzy
99b734bfd7
Fix #4587 : Status does not display "Pending" in report filter ( #9104 )
...
* adds Material Request to `status_map`
* updates eval condition for Partially Ordered in Material Request map
* changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options
* adds more options to `validate_status`
* adds `set_status` just before saving
* adds `check_for_closed_status` in `before_cancel`
* adds patch to convert status to material request specific status
* adds stricter status update conditions
* changes `update_status` to me `set_status`
* adds checker such that draft status can only change to pending
* renames `check_draft_status` to `status_can_change`
* adds Cancelled to Material Request map
* makes `status_can_change` block any attempt to change a cancelled document
* adds more test cases
* updates what `set_status` checks for before adding comment
* adds patch to rename the present material request status
2017-06-07 12:02:07 +05:30
Nabin Hait
e4b3a67e74
Rate validation in return entry
2017-06-01 16:47:45 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Nabin Hait
6a5cf672c1
Fixed opportunity status ( #9062 )
2017-05-30 15:34:20 +05:30
Ayush Shukla
e9cf1aba77
added float and rebase with hotfix ( #9019 )
2017-05-25 14:14:55 +05:30
Ben Cornwell-Mott
0f0b121669
Added BOM UOM selection for items
...
Added patch for BOM Item UOM
Fixed scrap qty issue
Added Scrap Qty update to patch
Reverted test record for production order
2017-05-24 11:12:51 -07:00
Prateeksha Singh
89cec18467
set variant name based on template name (frappe/erpnext#6367) ( #8920 )
2017-05-19 12:35:36 +05:30
Nabin Hait
83f8344e62
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:37 +05:30
Nabin Hait
ee59ecd396
Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:06 +05:30
Nabin Hait
e4f80a6eaa
Open lost opportunity again if quotation made against it ( #8854 )
2017-05-17 19:41:39 +05:30
Nabin Hait
1e2d7b3519
Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice ( #8882 )
2017-05-17 13:52:21 +05:30
Nabin Hait
8a27cf3785
Fix status of invoices with negative outstanding, if no return entry ( #8829 )
...
* Move allowance field in Item to the first section to apply it for both stock and non-stock items
* Fix status of invoices with negative outstanding, if no return entry
* get_value included in safe_eval
2017-05-16 12:43:00 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Prateeksha Singh
edeb4dc7e0
Multiselect dialog for getting items ( #8583 )
...
* Concatenate docnames and send to mapper
* Multiselect with checkboxes
* set setters as separate filters
* Map filter fields to target_doc
* Get items from quotation (in SO) working
* [major] Set dialog setters for all forms
* Add date field
* Specify non-default date_fields
* [minor] add test_mapper.py
* [minor] remove cur_frm
* [minor][fix] test
* [minor] fix test with make_test_records
2017-05-15 11:32:06 +05:30
Nabin Hait
4f5ad50ecf
Item Rate in Sales Return must be less than or equal to reference doc ( #8775 )
...
* Item Rate in Sales Return must be less than or equal to reference doc
* Fix as rate field is not there in Packed Item
2017-05-11 16:44:19 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Nabin Hait
4e6ff8ccd8
Ignore permission for Bin in warehouse query ( #8742 )
2017-05-09 15:09:10 +05:30
Rushabh Mehta
b7e740ff45
[minor] ignore permissions for bin on warehouse_query ( #8713 )
2017-05-06 12:44:03 +05:30
Nabin Hait
42343bbc2c
Selling price validation against last purchase rate / valuation rate ( #8702 )
2017-05-05 17:23:17 +05:30
Nabin Hait
b6a8920489
Fixed conflict
2017-04-28 09:58:41 +05:30
Rushabh Mehta
551406ab11
[enhance] automatic batch selection in Delivery Note and Stock Entry
2017-04-24 10:28:38 +05:30
Rushabh Mehta
e385b5b97b
[enhance] automatic batch creation, move and split
2017-04-24 10:28:38 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +05:30
mbauskar
9e9d242a24
[minor] fixes in test cases and added the test case for multiple uom in selling
2017-04-19 21:05:37 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
Javier Wong
54d9c9eaf4
Merge branch 'develop' into develop
2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
e471b02172
[minor] if packed item warehouse not found then set the parent item warehouse to packed items
2017-04-12 18:51:01 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Makarand Bauskar
4782e8b751
[minor] added safe_eval for status_updater and added getdate and nowdate ( #8365 )
2017-04-07 17:16:16 +05:30
Rushabh Mehta
b58979fd3e
[added] frappe.safe_eval
2017-04-06 18:58:39 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Nabin Hait
d681c88d79
validate returned qty only if there is reference qty
2017-04-06 15:20:45 +05:30
Rohit Waghchaure
faf51d91b6
[fix] stock qty issue in purchase trends report
2017-04-05 14:53:26 +05:30
Nabin Hait
6f038bc1f3
Validate total advance against grand total considering write off amount
2017-04-03 17:56:05 +05:30