Commit Graph

2284 Commits

Author SHA1 Message Date
Afshan
0fe14ce94e style: formate according to Codacy/PR Quality Review 2020-06-19 15:10:15 +05:30
Afshan
6f7652f425 fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total 2020-06-19 14:36:56 +05:30
Afshan
7a45c8bc28 fix: replaced "row_id" to "idx" as "row_id" was not available in variable "tax", also replaced "-1" by "-2" as "idx" starts with 0 rather than 1 2020-06-19 12:37:50 +05:30
rohitwaghchaure
b7a2f8731f
Merge pull request from nextchamp-saqib/update-items-permission-fix
fix: submitted sales order can be updated with no permission
2020-06-18 15:47:12 +05:30
Shivam Mishra
7057a807ca refactor: minor layout fixes to portal 2020-06-17 18:35:38 +05:30
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix 2020-06-15 11:44:59 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request from deepeshgarg007/pi_billing_address
fix: Billing address in for Purchase documents
2020-06-14 15:10:43 +05:30
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
rohitwaghchaure
496b6a28f2
Merge pull request from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop
fix: Cannot read property 'has_batch_no' of undefined
2020-06-10 17:57:07 +05:30
Rohit Waghchaure
afe8e88cb8 fix: Cannot read property 'has_batch_no' of undefined 2020-06-10 17:55:24 +05:30
Marica
aeeadee8f8
Merge branch 'develop' into update-items-permission-fix 2020-06-10 15:19:33 +05:30
marination
0c72249403 fix: Apply shipping rule without address too 2020-06-03 14:32:07 +05:30
Saqib Ansari
d531a8ab8d Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix 2020-05-29 22:37:13 +05:30
Saqib Ansari
c579b0879e fix: cannot update delivery date 2020-05-29 22:34:22 +05:30
Saqib Ansari
5da8b98a04 fix: label 2020-05-29 21:59:01 +05:30
Saqib Ansari
2c3c8aaa2d fix: submitted sales order can be updated with no permission 2020-05-29 21:55:38 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements () 2020-05-28 18:36:21 +05:30
Deepesh Garg
3a723dd815
Merge pull request from deepeshgarg007/acc_dim_report_filter
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:30:43 +05:30
Deepesh Garg
bcee78d054 fix: Remove console statement 2020-05-26 19:26:47 +05:30
Deepesh Garg
11ea0b1289 fix: Do not add filters in report on accounting dimension creation if it already exists 2020-05-26 19:23:45 +05:30
Abhishek Balam
18e7b60acc
feat(Selling): Gross Profit In Quotation ()
* added valuation rate and gross_profit in quotation item table

* modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller
2020-05-26 18:37:02 +05:30
Deepesh Garg
8d7f5d342d
fix: Item tax template not getting mapped from source to traget doc () 2020-05-22 12:28:45 +05:30
Deepesh Garg
f131260895
Merge pull request from netchampfaris/move-address-and-contact-templates-to-frappe
fix: Move address and contact templates to frappe
2020-05-22 09:27:33 +05:30
Faris Ansari
ca2b323117 fix: Move address and contact templates to frappe 2020-05-20 14:56:29 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
marination
a74d433cd8 fix: Fixed Dashboard Charts, modified fixtures and minor changes 2020-05-15 23:37:48 +05:30
marination
bb95cd5fd8 chore: Added Dynamic Charts to DN and PR Trends Reports 2020-05-15 01:33:43 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher () 2020-05-04 11:12:14 +05:30
Deepesh Garg
6df581f78b
Merge pull request from marination/commonify-warehouse-autofill
chore: Commonify auto-filling warehouses in child tables
2020-05-03 20:33:45 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ()
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Deepesh Garg
2b73dbeae0
Merge pull request from deepeshgarg007/duplicate_code
fix: Remove duplicate code from accounting dimension
2020-04-28 20:25:31 +05:30
Deepesh Garg
8705df6283 fix: Remove duplicate code from accounting dimension 2020-04-28 20:19:26 +05:30
marination
b7f6878222 fix: Handle empty child table 2020-04-28 19:18:45 +05:30
Marica
299e217668
fix: Blanket Order in SO/PO child tables () 2020-04-28 13:00:04 +05:30
Suraj Shetty
3e3a793567
fix: Set barcode field empty only if it has value ()
- 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
Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module ()
* feat: added rehab sub-module doctypes

* feat: rehab module

* feat: prescribe procedures in Patient Encounter

* feat: create Therapy Plan on Encounter submission

* feat: manage item for Therapy Type

* feat: book appointments, get prescribed therapies for Therapy Sessions

* feat: invoice Therapy Sessions

* feat: plan completion progress bar and exercise countsindicators

* feat: Motor Assessment Scale

* feat: add editable card view for exercise steps

* fix: add rehab in healthcare desk page

* fix: card deletion not working when child table is hidden

* feat: automatically fetch therapies according to Body Part

* fix: added tests for Therapy Type and Plan

* fix: add exercises according to body parts in Therapy Type

* fix: label for Exercise Instructions

* fix: exercise cards css

* feat: add dashboard for Therapy Plan

* feat: Patient Assessment Template and Patient Assessment

* feat: add title fields in Therapy Plan and Session

* fix: remove Motor Assessment Scale

* fix: fetch assessment description

* feat: create Patient Assessment from Therapy Session

* fix: anti pattern code

* fix: update desk page

* fix: exercise card rendering

* fix(test): filter out disabled Items in test_mapper

* fix: get stock uom from Stock Settings for Therapy Type Item creation

* fix: multiline SQL query

* fix: permissions for DocTypes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-22 13:07:12 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX ()
* 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 ()
* fix: on item change UOM not updated

* removing uom from js
2020-04-21 12:57:44 +05:30
rohitwaghchaure
3d2ced7926
Merge pull request 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 () 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 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 () 2020-04-14 12:53:54 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. () 2020-04-09 12:01:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb () 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 from marination/purchase-receipt-scan-barcode
feat: Scan Barcode in Purchase Receipt
2020-04-07 14:36:56 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements ()
* fix: nontype error for resolved and moved place order button at bottom left

* fix: removed inline style

* fix: Request for quotation move to lower right

* fix: move buttons

Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:18:47 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements ()
* 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 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 () 2020-04-03 10:08:19 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them ()
* 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 () 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 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 ()
* 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 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 () 2020-03-06 10:57:59 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return ()
* 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 () 2020-02-20 13:28:03 +05:30
rohitwaghchaure
15ca1181f8
Merge pull request 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 ()
* 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 ()
* 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 () 2020-01-21 13:04:21 +05:30
Don-Leopardo
ccdf19314d fix: min_qty and valid_from for the price selection () 2020-01-09 12:24:43 +05:30
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes ()
* 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 () 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) ()
* 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 () 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 ()
* 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 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 () 2019-12-23 18:27:12 +05:30
Marica
93cb64ee30 enhancement`: Added Set Reserve Warehouse field in Purchase Order. () 2019-12-23 18:24:56 +05:30
Rucha Mahabal
0e83a5754b fix: remove illustrations from onboarding slides ()
* 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 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 ()
* 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 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 ()
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 ()
* 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 () 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 ()
* 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 () 2019-11-12 14:43:41 +05:30
rohitwaghchaure
5d0362669d
Merge pull request 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 ()
* 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 ()
* 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 () 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 ()
* 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 () 2019-09-10 14:07:05 +05:30
Anurag Mishra
ac0c1edd23 feat: added date filter based on billing date and based date () 2019-09-06 12:10:10 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact ()
* 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 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 ()
* 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 ()
* 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 () 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 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 () 2019-07-15 18:57:25 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields ()
* 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 () 2019-07-11 14:39:24 +05:30
rohitwaghchaure
4870e95b83 fix: po, rate set as zero against the item () 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 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 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 ()
* 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 ()
* 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 () 2019-07-02 10:10:55 +05:30
Mangesh-Khairnar
fc3731f15e
Merge pull request 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 ()
* 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 ()
* 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 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 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 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 ()
* 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 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 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 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 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 () 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
Nabin Hait
318ba2b538
Merge branch 'develop' into lms-refactor 2019-05-22 15:15:51 +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
Rushabh Mehta
8c78299158 fix(readme): logo 2019-05-21 11:57:33 +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 ()
* 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 ()
* 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 ()
* 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
scmmishra
823d89cf66 fix (linting): codacy fixes 2019-04-22 11:46:22 +05:30
Shivam Mishra
f3cc87455a
Merge pull request from scmmishra/auto-fetch-serial
feat: Auto fetch serial numbers
2019-04-17 17:15:27 +05:30
scmmishra
fed4fd0f02 style: linting issue fixed 2019-04-17 15:46:15 +05:30
scmmishra
5522cf8c26 fix: codacy linting 2019-04-17 10:26:21 +05:30
scmmishra
6d3302b0cc style (codacy): code formatting fixes 2019-04-16 18:25:53 +05:30
scmmishra
ed4b052df8 style (codacy): code formatting fixes 2019-04-16 17:03:25 +05:30
scmmishra
46901076be feat: Use standard serial picker to add as well as update serial numbers 2019-04-16 17:01:01 +05:30
scmmishra
61d6b677e4 feat: Show standard serial number selector in item grid form 2019-04-16 15:17:27 +05:30
scmmishra
407496b528 chore: minor changes to labels 2019-04-16 13:32:41 +05:30
scmmishra
19a41ed16d chore: code cleaning 2019-04-16 12:51:05 +05:30
scmmishra
41cf945247 feat (UX): Refactored batch selector 2019-04-16 12:47:39 +05:30
scmmishra
b98612ff5b feat: Added auto fetch logic and button for client 2019-04-16 12:20:42 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request from rmehta/dashboard-refactor
fix(dashboard): as per new features
2019-04-15 16:52:54 +05:30
scmmishra
5b9df676a4 fix: minor bug in breadcrumb routing 2019-04-13 18:53:49 +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
Rushabh Mehta
d625c32ab1 fix(dashboard): for frappe updates, and a new splash logo 2019-04-11 16:13:58 +05:30
scmmishra
bae2d669b5 fix: codacy linting issues 2019-04-09 12:57:56 +05:30
scmmishra
b7d9efe901 Merged develop in lms 2019-04-09 11:39:12 +05:30
scmmishra
88f0c464b4 feat: Added breadcrumbs 2019-04-08 19:56:21 +05:30
Rushabh Mehta
fbc56c6d97 fix(style): left padding in marketplace view 2019-04-08 17:02:22 +05:30
cjpit
0c87895afc fix(node_modules): remove hardcoded symlink ()
* add node_modules directory to gitignore

* remove node_modules symlink
2019-04-05 00:12:26 +05:30
Nabin Hait
b861c4bc46
Merge pull request from Alchez/hotfix-shipping-charge-override
fix(transaction): Fix shipping rule charge override by tax template
2019-04-04 11:48:48 +05:30
scmmishra
d3bae4e8b5 feat: better cards in lms 2019-04-01 15:38:56 +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
scmmishra
2b7e158e50 feat: Quiz attempt limits is configurable
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
2019-03-29 12:45:08 +05:30
scmmishra
d4ed56af02 fix: navbar login bug 2019-03-29 11:03:34 +05:30
scmmishra
cea851522f feat: Added custom navbar 2019-03-28 15:33:08 +05:30
scmmishra
6123ff3251 fix: styled program card 2019-03-28 15:32:54 +05:30
scmmishra
9b7ac3e7d2 fix: fixed joining date bug on lms profile 2019-03-28 14:47:22 +05:30
scmmishra
281902f530 chore: clean up 2019-03-28 14:35:15 +05:30
scmmishra
394e93c2bf chore: Minor fixes on profile page 2019-03-28 14:34:23 +05:30
scmmishra
209250ccae fix: Profile page cards
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
2019-03-28 14:27:51 +05:30
scmmishra
c03db190d2 fix: layout for hero image of program card 2019-03-28 14:15:30 +05:30
scmmishra
29aaee1488 feat: Added youtube video component 2019-03-28 13:44:25 +05:30
scmmishra
92e311d9d7 feat: refactored YoutubePlayer component 2019-03-28 13:44:05 +05:30
scmmishra
15f6faad9b fix: Video stops on closing modal 2019-03-28 13:11:00 +05:30
scmmishra
526af9d268 feat: added Youtube Video component 2019-03-28 13:10:42 +05:30
scmmishra
9bfe3a0315 feat: Added Program Intro Video modal 2019-03-28 12:20:24 +05:30
scmmishra
233db67451 Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-03-27 18:27:05 +05:30
scmmishra
f04ceaec95 chore: removed commented code 2019-03-27 18:14:59 +05:30
scmmishra
5b57d977d8 fix: single primary action on LMS home 2019-03-27 18:14:41 +05:30
scmmishra
3d39b88e7c feat: LMS now supports multiple correct choice questions 2019-03-27 18:01:14 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Rushabh Mehta
c0de5b741e fix: remove gitter chat 2019-03-22 14:32:00 +05:30
scmmishra
43e9375642 feat [WIP]: Added multiple choice question component 2019-03-20 13:25:02 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
scmmishra
000e706337 feat: Only student progress is recorded in LMS
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
2019-03-19 12:30:43 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 ()
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
scmmishra
e3dea29f58 fix: Minor UI fix 2019-03-18 15:44:55 +05:30
scmmishra
14d70ce444 chore: updated education config 2019-03-14 12:31:25 +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
rohitwaghchaure
d4754619d0
Merge pull request from rohitwaghchaure/set_scanned_barcode_in_the_table
fix: scan barcode not adding the barcode value in the items table
2019-03-07 11:29:56 +05:30
scmmishra
18a1a8d4f4 style: Fixed route.js 2019-03-06 10:55:21 +05:30
Frappe Bot
8f0660ab31 Merge branch 'master' into develop 2019-03-01 09:22:36 +00:00
scmmishra
471140c6d4 fix: Minor changes 2019-02-28 18:14:25 +05:30
scmmishra
f0a56b977a feat: Minor fixes to profile page 2019-02-28 18:11:46 +05:30
scmmishra
ab8fc8c2bf feat: Quizzes fixed 2019-02-28 16:42:37 +05:30
scmmishra
b793cc8e1e fix: Minor changes 2019-02-28 16:33:38 +05:30
Rohit Waghchaure
c21cda2790 Removed validation for group by voucher in general ledger 2019-02-28 16:20:45 +05:30
scmmishra
5e61b17cf8 fix: Routing after finishing a course topic 2019-02-28 15:43:33 +05:30
scmmishra
de5f71ae9e fix: Showing Topic Progress 2019-02-28 15:40:49 +05:30
scmmishra
b17d289bda fix: Course card progress 2019-02-28 15:21:43 +05:30
Rohit Waghchaure
ab4ff984c4 fix: scan barcode not adding the barcode value in the items table 2019-02-28 13:31:02 +05:30
scmmishra
56ad5da090 fix: Minor Changes 2019-02-27 15:32:36 +05:30
scmmishra
e6735e418f fix: Content navigation 2019-02-27 12:46:23 +05:30
scmmishra
8747900aa1 Fix: Content title fields 2019-02-27 12:34:53 +05:30
scmmishra
47ccad9661 fix: Reloading bug on Content page 2019-02-27 12:24:17 +05:30
scmmishra
23880ae567 fix: Content fetching for articles and videos 2019-02-27 12:09:57 +05:30
scmmishra
628659e02a fix: Routing for course 2019-02-27 12:09:28 +05:30
scmmishra
90b503621b fix: Content Routing 2019-02-26 17:20:38 +05:30
scmmishra
7e1678e287 fix: TopicMeta fixes 2019-02-26 17:11:01 +05:30
scmmishra
03c4c635e0 fix: list title on CoursePage 2019-02-26 16:54:32 +05:30
scmmishra
c011b08699 fix: Fixed UI and API for course page 2019-02-26 16:49:38 +05:30
scmmishra
fed9adbc77 fix: Fixed API and UI for topic card 2019-02-26 16:49:15 +05:30
scmmishra
5ae51dc849 fix: Minor UI fixes 2019-02-26 16:48:49 +05:30
scmmishra
b5ba518bdb style: Minor code formatting 2019-02-26 16:48:12 +05:30
scmmishra
a8ef773978 fix: Course Card shows topic list 2019-02-26 16:47:54 +05:30
scmmishra
a2ca8dd92f fix: Route for course page 2019-02-26 16:47:10 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
deepeshgarg007
0d64d622e5 fix: filter only unique values for tree options 2019-02-20 17:55:14 +05:30
scmmishra
62968b318f wip 2019-02-19 18:25:07 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
scmmishra
cb8ef96f6b chore (css): Switched to frappe navbar 2019-02-19 17:03:16 +05:30
scmmishra
1682aa8a36 fix (css): Removed container class 2019-02-19 17:01:31 +05:30
scmmishra
765529241e [Major][Breaking] More changes 2019-02-19 13:06:33 +05:30
scmmishra
689500d081 Minor UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
d02fd13bf0 UI Improvements: Added Custom Navbar 2019-02-19 13:06:33 +05:30
scmmishra
87df23b52d Added quiz card on profile page 2019-02-19 13:06:33 +05:30
scmmishra
b3154efa84 UI Fixes 2019-02-19 13:06:33 +05:30
scmmishra
798f13be0d More Improvements 2019-02-19 13:06:33 +05:30
scmmishra
02420bd4ba Client side improvements 2019-02-19 13:06:33 +05:30
scmmishra
edc54cd5f6 Minor improvements for CardList.vue 2019-02-19 13:06:33 +05:30
scmmishra
2955851867 Built Student Profile Page 2019-02-19 13:06:33 +05:30
scmmishra
308f235859 Added Profile page 2019-02-19 13:06:33 +05:30
scmmishra
201fec3101 Minor Improvements 2019-02-19 13:06:33 +05:30
scmmishra
97c994f394 create course enrollment if not already enrolled for a program 2019-02-19 13:06:33 +05:30
scmmishra
cbb7c7ff23 ui fixes 2019-02-19 13:06:33 +05:30
scmmishra
788ffbd5b6 Minor improvements 2019-02-19 13:06:33 +05:30
scmmishra
9229f4fc92 UI fixes 2019-02-19 13:06:33 +05:30
scmmishra
fdbabde80a UI fixes for course card 2019-02-19 13:06:32 +05:30
scmmishra
be7fadc521 Renamed CoursePage to ContentPage 2019-02-19 13:06:32 +05:30
scmmishra
d93cec374d Minor UI changes 2019-02-19 13:06:32 +05:30
scmmishra
a592f70d4a Refactored Course Progression Logic 2019-02-19 13:06:32 +05:30
scmmishra
8951c165f0 Fixed major bugs 2019-02-19 13:06:32 +05:30
scmmishra
53c2d5db63 Refactored lms store 2019-02-19 13:06:32 +05:30
scmmishra
babb68d36c Refactored server side code 2019-02-19 13:06:32 +05:30
scmmishra
80ecc56cbe Using lms.call across the Vue app 2019-02-19 13:06:32 +05:30
scmmishra
0a4902f8b5 UI Changes 2019-02-19 13:06:32 +05:30
scmmishra
c5a1226e93 Refactored State management store 2019-02-19 13:06:32 +05:30
scmmishra
85c2feec0d Added ListPage and other UI improvements 2019-02-19 13:06:32 +05:30
scmmishra
efb01c3f75 Renamed components 2019-02-19 13:06:32 +05:30
scmmishra
2596ea0816 Renamed Vue Files 2019-02-19 13:06:32 +05:30
scmmishra
0225642459 Renamed Pages 2019-02-19 13:06:32 +05:30
scmmishra
8ff1028665 Renamed AcademyRoot to lmsRoot 2019-02-19 13:06:32 +05:30
scmmishra
1fbe2d4b2b Renamed academy to lms (Client Side) 2019-02-19 13:06:32 +05:30
scmmishra
44921a3ee9 Renamed default element for Vue to mount on 2019-02-19 13:06:32 +05:30
scmmishra
91bbe776c1 Modified academy.call to point to erpnext.www.lms 2019-02-19 13:06:32 +05:30
scmmishra
d7c993f028 Minor UI changes 2019-02-19 13:06:32 +05:30
scmmishra
f9b2fb6717 Fixed course and content page 2019-02-19 13:06:32 +05:30
scmmishra
708756ed40 Added academy namespace 2019-02-19 13:06:32 +05:30
scmmishra
cc166c01eb Improved Client implementation 2019-02-19 13:06:31 +05:30
scmmishra
8fa9adec37 More Bug fixes UI and Permissions 2019-02-19 13:06:31 +05:30
scmmishra
b409f7a388 Minor UI Changes and Fixes 2019-02-19 13:06:31 +05:30
scmmishra
86897b3cc8 UI: Kinda fixed "Completed" button render issue 2019-02-19 13:06:31 +05:30
scmmishra
5611bf4e29 Minor change 2019-02-19 13:06:31 +05:30
scmmishra
25e42baeaf Course completion logic complete 2019-02-19 13:06:31 +05:30
scmmishra
a920bca044 Minor UI fixes 2019-02-19 13:06:31 +05:30
scmmishra
0187b18c06 Added methods to saving Quiz attempts 2019-02-19 13:06:31 +05:30
scmmishra
a3afe2a998 Sending session data explicitly 2019-02-19 13:06:31 +05:30
scmmishra
cfce153ed4 Minor UI changes 2019-02-19 13:06:31 +05:30
scmmishra
1f4835b3b4 Added Video UI 2019-02-19 13:06:31 +05:30
scmmishra
6de9cbb52d Solved minor issue (Last activity not being saved) 2019-02-19 13:06:31 +05:30
scmmishra
1a04f774d7 LMS: Saving Course Activity 2019-02-19 13:06:31 +05:30
scmmishra
ed5892c7a5 UI: Components rendered based on student progress 2019-02-19 13:06:31 +05:30
scmmishra
a054655442 Updated state functions for session management 2019-02-19 13:06:31 +05:30
scmmishra
8b8db54ef4 Added enroll function 2019-02-19 13:06:30 +05:30
scmmishra
15012c08a4 UI Fixes 2019-02-19 13:06:30 +05:30
scmmishra
72fd3bc0ea Removed unnecessary watcher 2019-02-19 13:06:30 +05:30
scmmishra
3c412f56c9 UI: Changes to AcademyTopSection 2019-02-19 13:06:30 +05:30
scmmishra
bcafe84bb6 Adding session management to client 2019-02-19 13:06:30 +05:30
scmmishra
7a19b63837 Minor changes 2019-02-19 13:06:30 +05:30
scmmishra
e30f2eb297 Re-factored CourseCard UI 2019-02-19 13:06:30 +05:30
scmmishra
6678f5b88e Added custom store for state management 2019-02-19 13:06:30 +05:30
scmmishra
cd0cab78a5 Quiz UI Working 2019-02-19 13:06:30 +05:30
scmmishra
f7029f084c Quiz is now submittable 2019-02-19 13:06:30 +05:30
scmmishra
cfc35f4424 Quiz: Save responses as an object 2019-02-19 13:06:30 +05:30
scmmishra
d2e040b6f1 Added separate ContentTitle component 2019-02-19 13:06:30 +05:30
scmmishra
160d8b0914 Added separate ContentTitle component 2019-02-19 13:06:30 +05:30
scmmishra
d87ca178d8 UI for Quiz 2019-02-19 13:06:30 +05:30
scmmishra
7a59f9501e UI for Content 2019-02-19 13:06:30 +05:30
scmmishra
bcafbea481 UI for Course page 2019-02-19 13:06:30 +05:30
scmmishra
b43ab3317c UI for home page and program page 2019-02-19 13:06:30 +05:30
scmmishra
84297fa349 Starting with VueJS 2019-02-19 13:06:30 +05:30
scmmishra
1778b59efa Started with Vue 2019-02-19 13:06:30 +05:30
Rushabh Mehta
f3b33f3ab2
Merge pull request from karthikeyan5/hotfix-marketplace-features
feat(marketplace): seller profile page
2019-02-18 11:24:01 +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
karthikeyan5
4324dc6ea8 fix(marketplace): fixing hubmarket server specific error 2019-02-12 15:12:23 +05:30
karthikeyan5
4df6003bd9 feat(marketplace): seller profile page 2019-02-12 15:12:23 +05:30
karthikeyan5
2894f7935a feat(marketplace): featured Items for sellers 2019-02-12 15:12:23 +05:30
karthikeyan5
88baf53cc1 feat(marketplace): navigation link to seller profile from item page 2019-02-12 15:12:23 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Faris Ansari
8ae5dbcac8 fix: Set barcode in Item row after scanning barcode () 2019-02-07 07:09:49 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
karthikeyan5
4cb0a250a0 fix(marketplace): bug in filtering menu_items
> UX improvment for incomplete feature
2019-02-05 18:07:48 +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
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue 2019-01-29 11:29:41 +05:30
Nabin Hait
7c0fbfab0a
Merge pull request from pipech/staging-fixes
fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field
2019-01-29 11:23:05 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request from scmmishra/remove-foundation
feat: Deprecated In App Help
2019-01-29 11:20:23 +05:30
deepeshgarg007
49cca7ac76 fix: Customer based price_list in online POS 2019-01-25 16:41:01 +05:30
Shivam Mishra
67c338fd51
[fix] Fixed links
Previous commit missed the links starting with `http://`
2019-01-25 15:17:44 +05:30
scmmishra
f44dfb1582 [fix] Formatting issues 2019-01-25 14:56:30 +05:30
scmmishra
d71de2a23e [fix] Code formatting, removed trailing spaces 2019-01-25 14:27:23 +05:30
scmmishra
9731a02657 [feat] Added docsUrl variable to configure help_links 2019-01-25 13:14:11 +05:30
scmmishra
3f9b231f31 [fix] Links now redirect to erpnext.com 2019-01-25 12:56:27 +05:30
pipeCh
c16c7fffb4 fixed for "Select Serial Numbers" dialog won't fill mandatory field 2019-01-24 15:00:07 +07:00
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Nabin Hait
48fa697d54
Merge pull request from nabinhait/disable-rounded-total
fix: Disable rounded total field's value honours docfield's default value
2019-01-22 09:58:06 +05:30
scmmishra
f2d0be7299 [feat] Modified help config 2019-01-21 19:35:46 +05:30
scmmishra
dd461636e3 [feat] Updated all help_links 2019-01-21 19:35:02 +05:30
Nabin Hait
a39f324682 fix: Disable rounded total field's value honours docfield's default value 2019-01-21 18:50:50 +05:30
Aditya Hase
442c85c006 fix(marketplace): Capitalize marketplace factory class to support router changes () 2019-01-18 21:28:37 +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
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
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
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
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
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/item/item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Saif Ur Rehman
13a6c0aeff Fix tests 2019-01-06 18:14:18 +05:00
Saif Ur Rehman
7ea6554f1f Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
deepeshgarg007
8300f5ede7 fix: Codacy issues and added test case 2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix 2019-01-01 19:46:08 +05:30
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
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a More work on Tax Category and Item Tax Template 2018-12-27 02:11:07 +05:00
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c Merge branch 'master' into staging-fixes 2018-12-26 11:44:09 +00:00
deepeshgarg007
64238ee91f (Codacy Fix) Fixed indenttion 2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12 Loyalty program issue fix in customer dashboard 2018-12-25 16:06:19 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Suraj Shetty
5555bf82f8 Capitalize marketplace factory class to support recent router changes () 2018-12-19 10:15:59 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
Rohan
159897d88d fix(customer): Fix Total Unpaid amount in Customer dashboard () 2018-12-18 14:52:23 +05:30
Saurabh
e165fc0e1b Merge branch 'staging' into develop 2018-12-13 10:45:32 +05:30
Prateeksha Singh
c0f90beb7c Rename 'Chat' to 'Gitter Chat' 2018-12-12 21:29:55 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Stavros Anastasiadis
3d82b74ea4 Update Items in Submit state can add new row ()
* Update Items in Sumbit state can add new row

In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items

* Remove unused code line

* Remove blocking db save thread line

* Remove Company as not standard Field in Purchase Order Item

* Minor indentation fix

* Add Unit Test, add new row in update_child_qty_rate

* Codacy fix
2018-12-10 17:30:55 +05:30
Sagar Vora
4c5bd253a2 fix(party dashboard): empty array is truthy, check for length () 2018-12-10 17:19:10 +05:30
Nabin Hait
3248e0bb3e
Merge pull request from netchampfaris/hotfix-setupwizard-abbr
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-07 15:20:23 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f Merge branch 'master' into staging-fixes 2018-12-06 09:26:42 +00:00
Nabin Hait
32c95c3292
Merge pull request from nabinhait/travis-fix
fix(test): Fixed tests for discount with margin and period closing voucher
2018-12-06 11:58:56 +05:30
Faris Ansari
40c15348da fix(setup-wizard): Validate abbr length before switching to next slide 2018-12-06 07:37:32 +05:30
Rohit Waghchaure
675567419b [Fix] Permissions issue 2018-12-04 18:43:52 +05:30
deepeshgarg007
c981fb389b Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix 2018-11-29 14:57:50 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes 2018-11-28 08:12:48 +00:00
Nabin Hait
305c8b1fba
Merge pull request from shreyashah115/fix-timer
[Timesheet] Element selector in Timer
2018-11-27 17:57:46 +05:30
Nabin Hait
96598936ad fix(test): Fixed tests for discount with margin and period closing voucher 2018-11-27 17:48:13 +05:30
deepeshgarg007
c1a3c72b49 final dashboard design 2018-11-27 17:09:12 +05:30
deepeshgarg007
f31caffa74 Changes in get_dashboard_info 2018-11-27 15:04:12 +05:30
deepeshgarg007
6372fbba54 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix 2018-11-27 14:06:58 +05:30
shreyashah115@gmail.com
5281fe8e50 fix: Element selector 2018-11-27 13:11:30 +05:30
Nabin Hait
73e3138a5b
Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number 2018-11-26 20:20:22 +05:30
Rohit Waghchaure
b4a5993ece On uncheck is return field clear the reference field 2018-11-26 20:02:01 +05:30
Saif Ur Rehman
147fa73d3f Fixed incorrect use of 'this' causing errors calculating rate 2018-11-26 18:14:06 +05:00
deepeshgarg007
a1cffc3490 minor changes in dashboard 2018-11-23 16:51:35 +05:30
deepeshgarg007
0e8c36473a Added colspan to indicators 2018-11-23 11:22:24 +05:30
deepeshgarg007
920dc1400f Customer/Supplier dashboard fix for multi company setup 2018-11-23 10:17:28 +05:30
Ameya Shenoy
27a0c37963
css: build files in v10 2018-11-15 19:21:30 +00:00
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Nabin Hait
367a076fa4 fix(discount): Fixed item discount amount calculation 2018-11-13 18:41:58 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Saif
60ec88bcc8 Added Default Warehouse field that sets all item's warehouse ()
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied

* Set def_warehouse in test_sales_order.py

* Changed from def_warehouse to set_warehouse

* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Doridel Cahanap
2b14d6a058 Contract Manufacturing : Customer Provided Items ()
* Material Request from Production Plan for Customer provided parts

* Test cases

* Customer web portal for their material requests
2018-11-13 12:07:16 +05:30
Zarrar
6922415d1b [New Feature]Scan Item Barcode label to quick create/update records in items child table ()
* Update transaction.js

* setup barcode scan

stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js

* fix bug of item_code change always reset qty to 0

when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.

* Update transaction.js

* Update transaction.js

* Update transaction.js

* Update transaction.js

* Update transaction.js

* Update transaction.js

* clean up barcode logic for transactions

* call scan_barcode method for stock entry

* separate out logic for searching serial, batch or barcode number

* added scan barcode field in transactions doctype

* search barcode-serial-batch sequence, code rectify

* hide all barcode related field if disabled from settings

* remove print statement

* Update stock_entry.py
2018-11-13 11:11:32 +05:30
Faris Ansari
bbc1cb274e
Merge pull request from netchampfaris/marketplace-fixes-3
Hub fixes
2018-11-05 19:19:44 +05:30
Faris Ansari
d6b664f7ee fix(hub): Prevent registered actions 2018-11-05 19:18:48 +05:30
Faris Ansari
0d08da50c6 fix: Refresh PageContainer component based on current route 2018-11-05 15:47:26 +05:30
Faris Ansari
68dbf7f99c fix: Use frappe.utils.make_event_emitter 2018-11-02 13:30:51 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
Ameya Shenoy
6178b79555
Merge branch 'master' into staging-fixes 2018-10-30 12:48:45 +00:00
Faris Ansari
3df1327b94
fix: Delete button in POS mobile
Delete button was covered by page-actions container
2018-10-29 15:15:10 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop 2018-10-23 08:06:15 +00:00