Commit Graph

1768 Commits

Author SHA1 Message Date
Saqib
faea85451f
feat: auto set batch no on serial no selection (#20757)
* feat: auto set batch no on serial no selection

* fix: dialog not shown if set warehouse selected

* fix: typo

* fix: merge conflict

* fix: callback no getting called after serial no selected

* fix: available batch qty not fetched without set_warehouse selected

* fix: item batch not synced with dialog batch table
2020-03-26 13:18:57 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop
fix: batch selection popup not coming for stock entry
2020-03-24 16:32:21 +05:30
Deepesh Garg
4e3fbf5a8b fix: Default dimension set code cleanup 2020-03-24 15:43:21 +05:30
Rohit Waghchaure
5c1404e878 fix: batch selection popup not coming for stock entry 2020-03-24 11:40:03 +05:30
Deepesh Garg
8d72b14776 fix: Acccounting Dimension disappearing in first row after refresh 2020-03-09 08:06:07 +05:30
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument (#20838) 2020-03-06 10:57:59 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return (#20543)
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
2020-02-25 13:21:16 +05:30
Rohan
a29c87cfda
feat: remove unused route creation variable (#20558) 2020-02-20 13:28:03 +05:30
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
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371)
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
2020-02-17 15:58:08 +05:30
vishal
998de83d48 fix: filter serial no based on batch no 2020-02-11 12:24:44 +05:30
Parth Kharwar
2bccd7f717 fix: rename breadcrumb for Brand DocType from Selling to Stock 2020-01-30 12:12:42 +05:30
Rohit Waghchaure
067e8ad50d fix: add serial no button not working 2020-01-23 15:49:39 +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
Mangesh-Khairnar
cca6fb2794
Merge branch 'develop' into publish-item 2019-12-27 12:55:28 +05:30
Rohan
e944f7ac05 fix: Add Serial No button prompt (#20099) 2019-12-27 12:34:36 +05:30
Nabin Hait
8f3fea63b1
Merge branch 'develop' into publish-item 2019-12-27 12:19:02 +05:30
Mangesh-Khairnar
d19bd8f0dd
Merge branch 'develop' into publish-item 2019-12-25 22:10:33 +05:30
Nabin Hait
f32fc230f7 fix: rounding adjustment while both inclusive tax and discount amount present 2019-12-25 14:01:38 +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
DeeMysterio
df3b4e48fe fix(adress): get the address title at the top and mandatory in display (#20074) 2019-12-24 18:10:18 +05:30
Mangesh-Khairnar
7a5b9a7bbe fix: translations and route fixes 2019-12-24 17:39:15 +05:30
Saqib
0ad7449ae3 feat: allow adding & deleting of items in submitted SO & PO (#19911)
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-24 16:42:30 +05:30
Deepesh Garg
58408217f6
Merge pull request #19822 from Mangesh-Khairnar/edit-item-details
feat(marketplace): edit item details
2019-12-24 13:02:20 +05:30
Prssanna Desai
4f72c0b8b5 fix: wrong items in table being deleted (#19994) 2019-12-23 18:27:12 +05:30
Marica
93cb64ee30 enhancement`: Added Set Reserve Warehouse field in Purchase Order. (#19991) 2019-12-23 18:24:56 +05:30
Rucha Mahabal
0e83a5754b fix: remove illustrations from onboarding slides (#19872)
* fix: remove illustrations from onboarding slides

* fix: change Welcome slide's description

* fix: justify text in slide
2019-12-23 08:24:46 +05:30
Mangesh-Khairnar
c1a1e7d503 style: formatting changes 2019-12-19 20:11:37 +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
Deepesh Garg
d10cefa37e
Merge pull request #19893 from marination/rounded_total
fix: Disable Rounded Total always showing field default value
2019-12-11 18:40:56 +05:30
marination
ca6dbad7cb fix: Disable Rounded Total always showing field default value 2019-12-11 12:10:05 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469)
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Mangesh-Khairnar
0cb2783f80 fix: create unpublish log on the hub 2019-12-09 19:24:29 +05:30
Deepesh Garg
88c4514024
Merge pull request #19864 from nextchamp-saqib/report-col-fix
fix: column data not visible after manual selection of columns
2019-12-09 17:57:12 +05:30
Mangesh-Khairnar
ba48546678 fix: display new item value 2019-12-09 16:31:14 +05:30
Mangesh-Khairnar
d249d4c947 style: change formatting 2019-12-09 15:44:31 +05:30
Faris Ansari
317bf5a321
feat(marketplace): Add category wise search (#19760)
feat(marketplace): change route for category wise search
2019-12-09 13:59:30 +05:30
Rucha Mahabal
690068142b feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813)
* feat: added illustrations for onboarding

* refactor: change help label for supplier

* refactor (breaking): rename Setup Wizard slide to Onboarding Slide

* chore: code cleanup for the old doctype Setup Wizard Slide

* fix: added a 'Continue' type slide

* fix: change text in continue slide

* fix: change text for continue slide
2019-12-06 20:58:26 +05:30
Mangesh-Khairnar
6d4f4bef7e fix(marketplace): autocomplete hub category 2019-12-05 01:01:01 +05:30
Mangesh-Khairnar
e4274cbfa6 fix: change formatting 2019-12-04 17:51:08 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
Mangesh-Khairnar
fa170e3c84 fix(marketplace): add watcher for route change to fetch new items 2019-12-04 15:59:17 +05:30
thefalconx33
a639f16dc9 fix: column data not visible after manual selection of columns 2019-12-04 09:46:42 +05:30
Mangesh-Khairnar
c131bd1b25 feat(marketplace): edit item dialog 2019-12-02 01:09:59 +05:30
Mangesh-Khairnar
ad66677029 fix: add conditional message in template string 2019-11-29 23:59:02 +05:30
Mangesh-Khairnar
8287c3d05a feat(marketplace): unpublish item from hub 2019-11-29 15:52:29 +05:30
Mangesh-Khairnar
2597817cde fix: add new routes to handle category wise search 2019-11-28 18:57:42 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Mangesh-Khairnar
647331bbd7 feat: add search in category 2019-11-25 13:56:00 +05:30
Nabin Hait
1ed1c4e6a4 fix: make journal entry to sync stock and account balance 2019-11-25 12:33:40 +05:30
Rucha Mahabal
00677f334e fix: user progress code cleanup 2019-11-25 11:58:14 +05:30
Nabin Hait
aff4a67954 Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error 2019-11-22 15:14:32 +05:30
Rucha Mahabal
3cf2c2b3d5 feat: slides for onboarding wizard in ERPNext 2019-11-21 20:47:08 +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
marination
6ef057a2a3 fix: Prefilled JV via Account Balance and Stock Value mismatch error message
- Make JV button will route to Journal Entry and add rows in child table
2019-11-18 15:55:32 +05:30
Marica
29a2e16f62 fix: Add Serial No. button not responding (#19550) 2019-11-12 14:43:41 +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
Rohit Waghchaure
a20fb650fe code cleanup 2019-10-15 14:42:09 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221)
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Himanshu Warekar
46831c4c20 fix: show mobile no 2019-09-30 14:34:56 +05:30
Rohit Waghchaure
1f9a84f165 fix: removed mandatory property for address field in quick entry 2019-09-20 12:18:23 +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
Rucha Mahabal
2818b5bbe7 fix: 'link to material request' button not showing any message if no Material Request found (#19064) 2019-09-16 15:16:38 +05:30
Suraj Shetty
cdce6c746f fix: Make -> Create 2019-09-12 22:04:49 +05:30
Mangesh-Khairnar
7bcb24efbf fix(purchase-invoice): Update paid amount on creation of debit note (#18830)
* fix(purchase-invoice): set paid amount for purchase return

* fix(purchase-invoice): remove payment schedule on creation of debit note
2019-09-11 10:49:33 +05:30
Suraj Shetty
0254217314 fix: Make address fields mandatory (#18979) 2019-09-10 14:07:05 +05:30
Anurag Mishra
ac0c1edd23 feat: added date filter based on billing date and based date (#18936) 2019-09-06 12:10:10 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact (#18675)
* feat: render multiple addresses

* feat: move to newer contacts structure

* fix: iterate over valid variable

* fix: use primary label instead of bold letters

* fix: call popup get contact name from number

* fix: make contact structure  call popup compatible

* fix: query

* fix: add city, state and country

* fix: display address

* fix: get address in single line

* fix: review fixes

* fix: translation strings

* fix: fix query for contacts

* fix: remove references of mobile_no
2019-09-02 15:57:45 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
deepeshgarg007
0a2ed6da37 fix: Add missing semicolon 2019-08-16 15:50:17 +05:30
deepeshgarg007
8d0b6f9a60 fix: Handling if no default dimension exists 2019-08-16 14:00:26 +05:30
deepeshgarg007
2fb6bc9867 fix: Default dimensions in child doctypes 2019-08-15 17:06:32 +05:30
Suraj Shetty
b282f1f154
Merge branch 'develop' into refactor-call-popup 2019-08-09 18:18:17 +05:30
rohitwaghchaure
ed6fb66a90
Merge pull request #18679 from Anurag810/get-item-from-product-bundle
fix: get item from product bundle
2019-08-09 15:17:42 +05:30
Anurag Mishra
8d4b04e719 fix: get item from product bundle 2019-08-09 14:34:09 +05:30
Anurag Mishra
24c3b4e00f fix: get item from product bundle 2019-08-09 13:27:59 +05:30
Suraj Shetty
0957480305 fix: Show popup to employees with same phone number 2019-08-05 11:32:51 +05:30
Suraj Shetty
35c4b78e66 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-08-04 22:23:03 +05:30
Rohit Waghchaure
dadd049cbf fix: add serial no button not working for the delivery note 2019-08-02 19:11:31 +05:30
Deepesh Garg
d301d26fda fix: Enhancement in credit note (#18511)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16 fix: Enhancement in credit note (#18510)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
deepeshgarg007
f37fb82069 fix: Code cleanup 2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1 fix: Remove dimensions from boot 2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79 fix: Added default dimension and filter in bootinfo 2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310 fix: Default Accounting Dimensions in doctypes 2019-07-29 12:14:49 +05:30
deepeshgarg007
ec421df4e4 fix: Code cleanup 2019-07-29 08:58:56 +05:30
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4 fix: Default Accounting Dimensions in doctypes 2019-07-26 09:14:42 +05:30
Suraj Shetty
4177ecb6b2 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-07-22 15:18:03 +05:30