rohitwaghchaure
15ca1181f8
Merge pull request #20654 from marination/precision-mr-item
...
fix: Stock Quantity not calculated on client side in Material Request Items.
2020-02-18 12:34:16 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
marination
e143983819
fix: Stock Quantity not calculated on client side in Material Request Items.
2020-02-18 10:51:54 +05:30
Nabin Hait
50cb49cb00
fix: Don't fetch price list rate on change of qty ( #20363 )
2020-01-21 13:04:21 +05:30
Don-Leopardo
ccdf19314d
fix: min_qty and valid_from for the price selection ( #20217 )
2020-01-09 12:24:43 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* fix: Sort taxes based on validity
* fix: Validation for item tax template and filters based on validity
* fix: Add missing semicolon
* fix: Validate tax template only if item code available
* fix: Do not validate or filter item tax template if no item taxes applied
* fix: Consider item group for validating taxes
* fix: Test cases for item tax validation
* fix: Item tax template filtering fixes
* fix: Add missing semicolon
* fix: Remove unnecessary query
2020-01-06 15:34:15 +05:30
Rohit Waghchaure
660a78b877
fix: ignore pricing rule for other item group
2020-01-02 17:31:09 +05:30
Rohan
7372672044
fix: pull serial numbers linked to batches + pull warehouse correctly (develop) ( #19022 )
...
* fix: pull serial numbers according to set warehouses
* fix: handle purchase returns
2019-12-24 18:19:58 +05:30
Marica
93cb64ee30
enhancement`: Added Set Reserve Warehouse field in Purchase Order. ( #19991 )
2019-12-23 18:24:56 +05:30
Rohit Waghchaure
2ae79b8ac2
fix: Pricing Rule Discount for Product
2019-12-18 17:53:21 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
ronelvcabrera
370cdc0170
feat(Sales/Purchase Order): optional to reference a Blanket Order ( #19612 )
2019-12-04 16:07:11 +05:30
rohitwaghchaure
a85ddf2fb4
fix: performance issue of sales invoice while save/submit ( #19598 )
...
* fix: performace issue of sales invoice while save/submit
* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
rohitwaghchaure
5d0362669d
Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch
...
fix: not able to select the zero qty batch while making the sales ret…
2019-10-23 18:35:58 +05:30
Rohit Waghchaure
d8ddd1e2ec
fix: not able to select the zero qty batch while making the sales return entry
2019-10-22 14:05:13 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
Faris Ansari
8beca68948
feat: Scan Barcode using Camera in mobile ( #19033 )
...
* feat: Scan Barcode using Camera in mobile
* fix: Use input-group for scan button
* fix: Muted camera button
2019-09-16 15:20:10 +05:30
rohitwaghchaure
e9f0e88f9b
fix: taxes sequence if shipping rule is set in the sales invoice ( #18329 )
2019-07-15 18:57:25 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
rohitwaghchaure
03db4c0efc
Merge pull request #18166 from netchampfaris/send-sms-bom
...
fix: Don't show Send SMS in BOM
2019-07-04 19:11:42 +05:30
Faris Ansari
a5d975d867
fix: Don't show Send SMS in BOM
2019-07-04 17:47:28 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount
2019-05-01 12:23:30 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price ( #17386 )
...
* fix: Price list for UOM other than stock UOM
-Fixes conversion from default UOM item price to other UOMs
* fix: Typo
2019-04-29 23:18:47 +05:30
Nabin Hait
593242fa5c
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
2019-04-23 13:22:38 +05:30
Rohit Waghchaure
72cc37e8da
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-11 18:35:15 +05:30
Nabin Hait
b861c4bc46
Merge pull request #16895 from Alchez/hotfix-shipping-charge-override
...
fix(transaction): Fix shipping rule charge override by tax template
2019-04-04 11:48:48 +05:30
Rohit Waghchaure
70b996af73
fix: test cases
2019-03-31 20:34:52 +05:30
Rohit Waghchaure
e540534e42
fix: Pricing rule not working for POS
2019-03-31 17:13:18 +05:30
Rohit Waghchaure
8bfe330b37
feat: pricing rule enhancements
2019-03-19 12:44:30 +05:30
Rohan Bansal
90972cfbf9
fix(transaction): Avoid shipping rule charge override by tax template
2019-03-11 15:00:48 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Rohit Waghchaure
ab4ff984c4
fix: scan barcode not adding the barcode value in the items table
2019-02-28 13:31:02 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Faris Ansari
5631ffca68
fix: Barcode scanning UX
2019-02-12 17:12:48 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
Faris Ansari
8ae5dbcac8
fix: Set barcode in Item row after scanning barcode ( #16591 )
2019-02-07 07:09:49 +05:30
Saif Ur Rehman
1a441b267d
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-02-01 19:17:04 +05:00
deepeshgarg007
49cca7ac76
fix: Customer based price_list in online POS
2019-01-25 16:41:01 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
158e7dcd8b
fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM
2019-01-16 16:00:25 +05:30
Saif Ur Rehman
2689dea72a
fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse
2019-01-09 13:43:06 +05:00
Saif Ur Rehman
eeead1d777
fix: Only load transaction's company's tax accounts in item tax map
2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
Saif Ur Rehman
e414a92d55
fix: Run get_item_tax_info and set_taxes serially
2018-12-28 04:59:42 +05:00
Saif Ur Rehman
aca374e478
feat: add_taxes_from_item_tax_template
2018-12-28 04:53:25 +05:00
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00