Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,796 Commits 3 Branches 0 Tags 1 GiB
a0ac5e3b13
Commit Graph

1838 Commits

Author SHA1 Message Date
Suraj Shetty
3e3a793567
fix: Set barcode field empty only if it has value (#21425) 
- To avoid unnecessary form dirty trigger
 2020-04-26 23:25:40 +05:30
Saqib Ansari
8c70e8d4df fix: remove debugger 2020-04-24 16:41:48 +05:30
Saqib Ansari
40140c63dc fix: rate gets overwritten when pricing rule is set 2020-04-24 14:51:56 +05:30
marination
8a30cb2565 chore: Commonify autofilling warehouses in child tables 2020-04-23 00:18:21 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX (#20810) 
* fix (ux): Material Request Form Cleanup

* fix: Get Items from popup UX

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:13:39 +05:30
Anupam Kumar
a9d59fad94
fix: on item change UOM not updated (#21242) 
* fix: on item change UOM not updated

* removing uom from js
 2020-04-21 12:57:44 +05:30
rohitwaghchaure
3d2ced7926
Merge pull request #21345 from rohitwaghchaure/fixed_free_item_qty_develop 
fix: free item quantity issue
 2020-04-21 01:10:33 +05:30
Rohit Waghchaure
d093a377ef fix: free item quantity issue 2020-04-21 01:09:44 +05:30
Saqib
14cdb24290
fix: serial and batch selection from delivery note bug fix (#21291) 2020-04-16 16:21:35 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev 2020-04-15 23:48:27 +05:30
Saqib Ansari
f53299e98a fix: warehouse unset when cannot find item warehouse 
* cannot set delivery date when all items gets deleted and new are added
 2020-04-15 22:10:48 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer 
feat: Provision to set Default Item Manufacturer
 2020-04-15 16:35:08 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed (#21251) 2020-04-14 12:53:54 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. (#21206) 2020-04-09 12:01:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb (#21190) 2020-04-08 11:49:06 +05:30
marination
3e7a8abf29 feat: Provision to set Default Item Manufacturer 
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
 2020-04-07 21:00:57 +05:30
rohitwaghchaure
55ea142afd
Merge pull request #21181 from marination/purchase-receipt-scan-barcode 
feat: Scan Barcode in Purchase Receipt
 2020-04-07 14:36:56 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements (#21020) 
* feat: Date range in financial statements

* feat: Add date range filter in consolidated financial statement

* fix: Handle API changes in query_report

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-07 12:16:25 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop 
fix: material request type manufacture shows items with Is Purchase I…
 2020-04-07 12:06:18 +05:30
marination
e05013ede3 feat: Scan Barcode in Purchase Receipt 2020-04-06 22:13:13 +05:30
Rohit Waghchaure
5317907e15 fix: material request type manufacture shows items with Is Purchase Item enabled 2020-04-06 17:53:16 +05:30
Shivam Mishra
3251e1304c
fix: lms quiz type error (#21152) 2020-04-03 10:08:19 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them (#21078) 
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: docname is editable in update items dialog
 2020-04-03 10:02:56 +05:30
Deepesh Garg
0f25a40421 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-04-02 21:30:53 +05:30
Marica
7ecacb6360
Merge branch 'develop' into item_code_showing_as_mandatory_issue_develop 2020-04-01 10:47:33 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry (#21083) 2020-03-31 15:26:45 +05:30
Deepesh Garg
c33412b6ae feat: Link blanket order and quotation 2020-03-30 22:44:13 +05:30
Rohit Waghchaure
e7c4565483 fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings 2020-03-28 14:59:00 +05:30
rohitwaghchaure
0fc8b2af60
Merge pull request #21077 from rohitwaghchaure/default_item_is_not_coming_while_making_new_bom_develop 
fix: item not showing in popup while making batch
 2020-03-27 13:49:23 +05:30
Rohit Waghchaure
a5357c2e27 fix: item not showing in popup while making batch 2020-03-27 12:59:02 +05:30
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
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
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
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
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
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
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
Rucha Mahabal
65a627cb5b fix: module changes for Auto Repeat from Desk to Automation (#18356) 2019-07-17 13:50:32 +05:30
Suraj Shetty
f5dd494716 fix(call popup): Multiple changes 
- Remove summary from call log use comments instead
- Add contact and lead if matched to the call log
- Add received by field with Employee Link
- DocPerm to allow Employees to have read access on call log
- Remove unwanted code
- Add a method to get lead just by providing phone number
- Show popup only to Employee to which the system is trying to connect.
- Remove custom code from call popup dialog and replace it with
 standard fields
- Increase timeout to hide popup after the call has been disconnected.
 2019-07-16 11:07:25 +05:30
Deepesh Garg
ce3594796c
Merge pull request #18320 from deepeshgarg007/quo_opp_address_fix_develop 
fix: Address fixes in quotation and opportunity
 2019-07-16 08:42:18 +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
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788) 
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
 2019-07-15 18:02:58 +05:30
deepeshgarg007
d5fcab5f81 fix: Set taxes fix for lead 2019-07-15 12:44:11 +05:30
Suraj Shetty
ef1d0d1d14
Merge branch 'develop' into breadcrumbs-module-map-2 2019-07-11 15:02:42 +05:30
Nabin Hait
fca86c48c8
fix: Revert #frappe/erpnext/17896 (#18251) 2019-07-11 14:39:24 +05:30
rohitwaghchaure
4870e95b83 fix: po, rate set as zero against the item (#18242) 2019-07-11 10:03:35 +05:30
Suraj Shetty
7837fbe231
style: Add missing semicolon 2019-07-10 19:39:40 +05:30
Faris Ansari
a7a6987c42 fix: Add Shopping Cart and Contacts 2019-07-10 19:27:57 +05:30
Faris Ansari
ab46f0f5bb fix: Add module map for breadcrumbs 2019-07-10 19:27:44 +05:30
Suraj Shetty
838697261d
fix: Call popup avatar 
Avoid getting session users image if customer doc has no image
 2019-07-10 10:39:43 +05:30
Deepesh Garg
62911ec198
Merge pull request #18206 from Anurag810/sending_sms_from_quotation 
fix: sending sms from quotation
 2019-07-10 09:18:43 +05:30
Anurag Mishra
e9dd9b842e
Update erpnext/public/js/sms_manager.js 
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2019-07-09 17:54:00 +05:30
deepeshgarg007
890ea195f3 fix: Tree filter fixes for erpnext dimensions 2019-07-09 16:56:56 +05:30
Anurag Mishra
de13faf19a fix: sending sms from quotation 2019-07-09 14:27:20 +05:30
deepeshgarg007
6bb5ade667 fix: Add accounting dimensions to various reports and fixes 2019-07-07 21:24:45 +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
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143) 
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-07-03 15:15:08 +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
Deepesh Garg
78a86af7fd fix: Fiter passing fix in get batch query (#18131) 2019-07-02 10:10:55 +05:30
Mangesh-Khairnar
fc3731f15e
Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix 
fix: clear duplicates in mapped doc
 2019-07-01 17:04:12 +05:30
Suraj Shetty
502565ff56 fix: Make required changes 2019-07-01 14:28:59 +05:30
Suraj Shetty
19e4fde737 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-30 15:30:59 +05:30
Mangesh-Khairnar
e493490702 fix: mapped doc 2019-06-28 19:22:51 +05:30
Himanshu
ea4c42d47b fix(Utils): Do not add duplicate items (#17896) 
* fix: do not add duplicate items

* Update erpnext/public/js/utils.js

Co-Authored-By: Rohan <Alchez@users.noreply.github.com>

* fix: compare warehouses, batch and qty for an item

* fix: code fixes

* Update utils.js

* fix: check required_date and delivery_date

* Update utils.js

* fix: mixed tabs and spaces
 2019-06-28 14:13:13 +05:30
Deepesh Garg
fb29ffc90c fix: Usability fixes to Serial No and batch selector (#18071) 
* fix: Usability fixes to Serial No and batch selector

* fix: Codacy

* Update sales_common.js
 2019-06-28 14:08:08 +05:30
Mangesh-Khairnar
3b60fac3b7 fix: open department in tree view via awesome bar 2019-06-27 11:43:22 +05:30
Deepesh Garg
d11e481888
Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission 
fix: Get Accounting Dimension only if user has read permission on it
 2019-06-20 19:44:59 +05:30
Suraj Shetty
01f56b867e fix: Return empty array to avoid failure 2019-06-20 18:07:58 +05:30
Suraj Shetty
b663966c68 fix: Use can_read API 2019-06-20 18:00:19 +05:30
Rushabh Mehta
55c7b69afb
Merge pull request #17998 from netchampfaris/app-logo-url 
fix: App logo URL
 2019-06-20 17:53:40 +05:30
Suraj Shetty
da629810ad fix: Get accounting dimensions only if user has access 2019-06-20 17:20:19 +05:30
Faris Ansari
357592f55e fix: Remove logo replace logic 2019-06-19 19:17:50 +05:30
rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate 
fix: Consider discount_amount only when provided to calculate rate
 2019-06-19 14:47:06 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter (#17943) 
* fix: User MultiSelectList control for Party filter

The comma based filter wouldn't work for values that had comma in them

* fix: Replace with MultiSelectList in reports

* fix: Parse json instead of string split
 2019-06-19 12:15:37 +05:30
Aditya Hase
48585c94ff fix: Consider discount_amount only when provided to calculate rate 
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.

All DocTypes on buying side have this bug.
 2019-06-18 19:11:17 +05:30
Suraj Shetty
5b52aba8df Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-18 11:28:20 +05:30
Suraj Shetty
a28b96493f fix: Make field labels translatable 2019-06-18 11:28:14 +05:30
Suraj Shetty
a367a85a78
Merge branch 'develop' into call-summary-dialog 2019-06-18 11:09:29 +05:30
deepeshgarg007
946eefe039 fix: Codacy fixes 2019-06-17 23:10:36 +05:30
deepeshgarg007
dfe006be19 Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes 2019-06-17 15:26:05 +05:30
deepeshgarg007
d1e0f42fea fix: Styling fix 2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33 fix: Is group filter fixes in dimensions 2019-06-17 12:44:49 +05:30
Suraj Shetty
eb0ca67ced fix: Caller name in call popup 2019-06-17 08:59:12 +05:30
Suraj Shetty
5ea6a5e33a fix: Decouple call popup from exotel 2019-06-17 08:46:38 +05:30
Faris Ansari
8e99aaf605 fix: Add erpnext website theme import 2019-06-14 20:06:54 +05:30
Suraj Shetty
2f84779667 fix: Last Communication for lead 
- Remove unused code
- Remove unused import
 2019-06-12 10:31:07 +05:30
Suraj Shetty
7ff124db95 fix: Show lead name when the lead calls 2019-06-11 14:21:48 +05:30
Suraj Shetty
28f7c3ca3f fix: Add Make contact button 2019-06-11 12:21:30 +05:30
Suraj Shetty
6013375fbb fix: Improve call popup UX 
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
 2019-06-11 08:03:55 +05:30
deepeshgarg007
9297829804 fix: Codacy 2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87 fix: Available qty not shown in item batch selector for batch 2019-06-10 17:46:16 +05:30
Suraj Shetty
13770ccf7a fix: Codacy 2019-06-10 09:52:53 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +05:30
Suraj Shetty
f1ffdb3c12 feat: Add call sound effects 2019-06-07 12:48:13 +05:30
Suraj Shetty
6a87e3338b fix: Call popup UI 2019-06-07 11:52:39 +05:30
Suraj Shetty
c8c17422f7 fix: Change call log fieldname and some cleanups 2019-06-07 10:22:50 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor 
refactor: lms
 2019-06-06 16:32:17 +05:30
Suraj Shetty
97780613ad fix: Improve call popup UI 2019-06-06 14:48:37 +05:30
Suraj Shetty
cf270845f2 fix: Indicator toggler 2019-06-05 10:04:51 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions 
feat: Configurable Accounting Dimensions
 2019-06-03 17:00:58 +05:30
Shivam Mishra
8ddb63adae feat: added auto course enrollment for enrolled programs 2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop 
fix: Serial no filtering issue for delivered items
 2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev 
fix: Rounding adjustment while additional discount amount is applied on grand total
 2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934 fix: Pass delivery document no as empty string 2019-06-03 13:06:37 +05:30
Shivam Mishra
d1a252190b refactor: refactored quiz api and added quiz.js 2019-06-03 12:57:38 +05:30
Suraj Shetty
d1668e22d1 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-03 12:36:45 +05:30
Suraj Shetty
e9bfecf405 fix: Add code to update call summary 2019-06-03 12:27:02 +05:30
deepeshgarg007
853a561f11 fix: Serial no filtering issue for delivered items 2019-06-03 12:11:54 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
Suraj Shetty
893a0c24bb fix: Add call summary 2019-05-31 13:42:22 +05:30
Rohit Waghchaure
4fd704dbb6 fix: POS cash mode of payment css 2019-05-30 23:25:41 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
Shivam Mishra
253a2bd260 refactor: goodbye Vue 👋 2019-05-30 18:54:11 +05:30
Nabin Hait
d060890817 fix: Rounding adjustment while additional discount amount is aplied on grand total 2019-05-30 16:05:30 +05:30
deepeshgarg007
ffec8be85f fix: Styling and test case fixes 2019-05-28 17:56:07 +05:30
deepeshgarg007
e025aabef0 fix: Indentation fixes 2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f fix: Styling and test case fixes 2019-05-28 16:03:08 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7 fix: Multiple fixes in accounting doctype 2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b fix: Is group filter for dimensions for doctype 2019-05-28 12:13:53 +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
Suraj Shetty
bd03a51e8f fix: Handle end call 2019-05-27 15:30:41 +05:30
Suraj Shetty
39a4d59cf6 fix: Call popup modal 2019-05-27 10:38:43 +05:30
deepeshgarg007
e9c6e644f7 fix: Multiple changes in dimension creation logic 2019-05-26 12:34:13 +05:30
deepeshgarg007
d330519f7c fix: Merge branch develop into dimensions 2019-05-25 18:18:08 +05:30
Suraj Shetty
591ad37894 fix: call popup [wip] 2019-05-24 10:11:48 +05:30
Suraj Shetty
07fe299628 fix: Make changes to fix call flow and popup trigger 2019-05-22 15:48:57 +05:30
Suraj Shetty
ee7d6e4598 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-22 14:55:48 +05:30
Suraj Shetty
fb1964aa18 fix: Changes to fix popup 2019-05-22 06:38:25 +05:30
Suraj Shetty
863b93c32d refator: Rename files and move code 2019-05-21 07:57:06 +05:30
Shivam Mishra
823c79588b feat: Moving to Jinja 2019-05-19 16:01:45 +05:30
Suraj Shetty
8a178d6f30 fix: Update call summary dialog 2019-05-18 16:11:29 +05:30
Suraj Shetty
dd6b70c7cd feat: Show contact on incoming call 2019-05-16 23:55:35 +05:30
Shivam Mishra
8a976ba8ab
feat: LMS is now compatible with Frappe Theme (#17600) 
* style: UI fixes for frappe_theme compatibility

* chore: minor ui fixes
 2019-05-16 16:38:13 +05:30
Nabin Hait
3fccfaa7ce feat: Added 'Add Multiple' options in all sales / purchase transactions 2019-05-16 14:54:05 +05:30
Suraj Shetty
03c3bd5f4a feat: Open modal in realtime for incoming call 2019-05-16 13:39:50 +05:30
Suraj Shetty
d382f1d470 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-05-16 09:47:17 +05:30
deepeshgarg007
60f4dd0736 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-14 15:51:12 +05:30
Shivam Mishra
f82d0a6074 fix: show video duration and publish date only if data exists 2019-05-14 12:02:51 +05:30
Shivam Mishra
2430fd3a4c chore: show description on course card 2019-05-14 11:24:51 +05:30
deepeshgarg007
e64c357216 fix: Commified function to get dimensions 2019-05-14 08:50:45 +05:30
deepeshgarg007
d83cf65be1 fix: Added dimensions in financial reports and general ledger 2019-05-12 18:34:23 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
Suraj Shetty
8b0588deaf feat: Init call summary popup 2019-05-02 14:59:44 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount 2019-05-01 12:23:30 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts (#17077) 
* fix: Move Newsletter script from frappe to erpnext

* fix: Remove old style client scripts

* C-Form

* fix: Cost Center

* fix: Fiscal Year

* fix: Monthly Distribution

* fix: Payment Gateway Account

* fix: Pricing Rule

* fix: Missing semicolon
 2019-04-30 10:18:09 +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
Shivam Mishra
9fe7257bfc fix (ui): refactored breadcrumbs 2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb fix (ui): Card layout 2019-04-25 19:33:22 +05:30
scmmishra
bf7d13a7be Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-04-24 09:50:19 +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
Rushabh Mehta
77b82894ff fix(style): buttons in address and contact 2019-04-23 07:57:31 +05:30
scmmishra
68b3203366 chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment 2019-04-22 18:50:08 +05:30
scmmishra
804a74c01c fix (ui): UI fixes to Video page 2019-04-22 17:52:48 +05:30
scmmishra
6c8f23b27e fixed (ui): Fixed cards with better buttons 2019-04-22 17:51:30 +05:30
Rohit Waghchaure
270d4e9f4e fix: moved erpnext related methods from frappe to erpnext 2019-04-22 14:11:43 +05:30
scmmishra
4add826703 chore: Minor code improvements 
- Changed variable name in `get_content` function
- Added proper exceptions for `get_topic` and `get_content` functions in lms
 2019-04-22 12:28:13 +05:30
scmmishra
da2c90cd18 chore: renamed get_program api functions 
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
 2019-04-22 12:21:40 +05:30
scmmishra
d78c326f95 chore: renamed get_topic_meta to get_student_topic_details 2019-04-22 12:06:28 +05:30
scmmishra
d5973fe4bc chore: renamed get_course_meta to get_student_course_details 2019-04-22 12:05:22 +05:30