Wolfram Schmidt
5249a6348f
Update de.csv ( #19755 )
...
Changed all translations from "Aufgabe" to "Vorgang" in singular and plural where the word "Task" is project related. Left all agricultural and others how they are (as Aufgabe).
2019-12-01 10:47:21 +05:30
Deepesh Garg
98a54355ae
fix: Post GL entry fix for asset ( #19751 )
2019-12-01 10:06:16 +05:30
Himanshu Warekar
4405a2a5f8
fix: add project in child for items
2019-11-30 16:58:31 +05:30
Mangesh-Khairnar
ad66677029
fix: add conditional message in template string
2019-11-29 23:59:02 +05:30
Gavin D'souza
5e217c698f
Merge branch 'set-request-util' of github.com:gavindsouza/erpnext into set-request-util
2019-11-29 20:30:03 +05:30
Gavin D'souza
23b1dae6a7
chore: dropped dead setup_wizard test
...
fix: fixed imports for teste utils
2019-11-29 20:22:06 +05:30
Nabin Hait
d1b1156b8c
Merge branch 'develop' into set-request-util
2019-11-29 18:49:34 +05:30
Rohit Waghchaure
8c6bc34bc4
added test cases
2019-11-29 18:42:20 +05:30
Victor Munene
b3af2adc4a
use program.courses instead of get_all_children to get course list ( #19695 )
2019-11-29 18:12:13 +05:30
Anurag Mishra
935517d914
fix: added bank reconciliation page in the accounting module ( #19719 )
...
* fix: added bank reconcilation page inaccounting module
* Update accounts.py
2019-11-29 18:08:42 +05:30
Sammish Thundiyil
54694dd816
modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json ( #19470 )
2019-11-29 18:00:30 +05:30
Gavin D'souza
611d2ccd04
chore: updated path for set_request in v13-develop
2019-11-29 17:42:32 +05:30
Anurag Mishra
10017c14f3
feat: HSN Code wise Item Tax ( #19478 )
...
* feat: HSN Code wise Item Tax
* feat: enqueued task of updating all items
2019-11-29 17:33:10 +05:30
Raffael Meyer
0de066c3b1
feat(regional): Add master data to DATEV Export ( #18755 )
...
* Add master data to export
* add SQL statements to get customers and suppliers
* make data category a string
* fix SQL error
* fix SQL errors
* unique column names
* add encoding of constants
* get customer primary address and contact
* fix typo
* fix typo
* binary response
* add filename
* add filecontent
* rename account columns
* exclude account groups
* use compression, close file before transfer
* fix StringIO
* add basic tests
* fix assertion, merge test methods
* fix indentation
* relative import of constants
* fix path
* import os
* Add default currency to test company
* root accounts with parent = null
* move account-related things to setup()
* add: test headers
* company and filters become class properties
* add: test csv creation
* (fix): add missing account
* (fix): remove wrong space
* add items to sales invoice
* refactor: create test data
* fix: create cost center
* fix: doctype Accoutn
* fix: make sure account belongs to company
* fix: remove customer group and territory, save on a new line
* create default warehouses
* fix: make Item myself
* fix: item defaults are a list
* fix: use my own warehouse
* fix: use my own expense account
* fix: let you take care of the Sales Invoice Item
* fix: import zipfile
* add TODOs
* fix: workaround for pandas bug
* SQL: utf-8 everywhere to make conversion in tests unnecessary
* tests: zipfile must be encoded string
* fix(tests): invalid start byte
* fix(test): give is_zipfile() the file-like object it expects
* fix(test): fix encoding of colums
* fix(get_transactions): as_dict is 1 by default
* fix(tests): allow empty data
* refactor: rename columns in get_account_names
* fix(pandas): keep sorting columns
* fix: "lineterminator" must be a string
* fix(test): check if cost center exists
* fix: credit limit became a child table
* fix: save company after creation
* insert instead of save
* tests: setup_fiscal_year
* fix(test): import cstr
* fix(tests): fiscal year
* fix: can't concat str to bytes
* fix: make csv-encoding work for py2 and py3
* fix(test): use frappe.as_unicode instead of unicode
* fix: use BytesIO instead of StringIO for py3 compatibility
* fix(tests): use BytesIO instead of StringIO for py3 compatibility
2019-11-29 17:32:17 +05:30
Prasad Ramesh
750b3a5946
fix: Button label case ( #19706 )
...
Json -> JSON
2019-11-29 17:30:46 +05:30
Khushal Trivedi
e3c05290c8
fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req ( #19691 )
2019-11-29 17:00:09 +05:30
Deepesh Garg
06a6fa4cfc
feat: Accounts Payable report based on payment terms ( #19672 )
2019-11-29 16:56:27 +05:30
Saqib
20c31dd579
fix: tax templates from all companies fetching in receipt ( #19682 )
...
* fix: tax templates from all companies fetching in receipt
* Update purchase_receipt.js
2019-11-29 16:55:10 +05:30
rohitwaghchaure
d76529e6ca
Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix
...
fix: Serial no validation against sales invoice
2019-11-29 16:34:58 +05:30
rohitwaghchaure
c9afe2f707
Merge pull request #19602 from Anurag810/bom-explorer-report-fix
...
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-29 16:18:30 +05:30
deepeshgarg007
c51dd2989e
fix: Validation msg
2019-11-29 15:56:16 +05:30
deepeshgarg007
45f57f273c
fix: Serial no validation against sales invoice
2019-11-29 15:56:08 +05:30
Mangesh-Khairnar
8287c3d05a
feat(marketplace): unpublish item from hub
2019-11-29 15:52:29 +05:30
rohitwaghchaure
b59a25b02b
Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module
...
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:29:31 +05:30
Mangesh-Khairnar
92b9d7383d
fix: show create payment request for so that are not billed
2019-11-29 14:22:52 +05:30
Rohit Waghchaure
bf8fe06f86
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:14:11 +05:30
Rohit Waghchaure
8b599f2bc9
fix: capacity planning back
2019-11-29 14:09:30 +05:30
Suraj Shetty
9d6d95c4a2
fix: valuation of "finished good" item in purchase receipt ( #19268 )
...
* fix: Remove redundant purchase orders and unwanted condition
* fix: [WIP] Purchase receipt value
* fix: Add raw material cost based on transfered raw material
* fix: get_qty_to_be_received
* fix: Remove debugger statement
* fix: Reset rm_supp_cost before setting subcontracted raw_materials
* test: Fix and modify tests for backflush_based_on_stock_entry
* fix: Add non stock items to Purchase Receipt from Purchase Order
* fix: Ignore valuation rate check for non stock raw material
* fix: Rename check all rows
* fix: Remove amount from test
* test: Fix item rate error
* fix: handling of serial nos in backflush
* fix: Add serial no. of raw materials
* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material
* fix: Raw material batch number selection in purchase receipt
* Update test_purchase_order.py
2019-11-29 13:26:52 +05:30
Marica
8f48896261
fix: Permission issue in Stock Entry ( #19738 )
2019-11-28 19:39:49 +05:30
Mangesh-Khairnar
2597817cde
fix: add new routes to handle category wise search
2019-11-28 18:57:42 +05:30
Anurag Mishra
f3b393f5e0
fix: UOM was not fetching in purchase invoice ( #19732 )
...
* fix: UOM was not fetching in purchase invoice
* fix: Changes requested
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 18:52:16 +05:30
Deepesh Garg
7cdde93645
fix: Validation for parent cost center ( #19664 )
...
* fix: Validation for parent cost center
* fix: Minor modification in condition
* fix: Update test cases for invalid cost center creation
2019-11-28 18:37:51 +05:30
Joseph Marie Alba
5c2ba0ef9c
Fix: Logic bug ( #19692 )
...
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
- if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group.
- should be if accounts[d]['is_group'] not in ('', 0)
However, the correction provided here:
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1]
is more consistent with the prior statement that extracts ledger (and not group) accounts.
account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
2019-11-28 18:33:20 +05:30
Deepesh Garg
9f3276046f
fix: Account type in Handling Difference in Inventory account ( #19674 )
...
* fix: Account type in Handling Difference in Inventory account
* fix: Add Stock Adjustment account
* fix: Rename account to stock adjustment
2019-11-28 18:29:33 +05:30
Saqib
707b83940a
fix: due date before posting date for items added to cart yesterday ( #19681 )
2019-11-28 18:27:17 +05:30
Marica
bcd02069ea
fix: Validation for Suppliers in SO to PO ( #19686 )
...
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
2019-11-28 18:23:45 +05:30
Marica
aff678e376
fix: Changed type of column 'serial_no' in Stock Ledger Entry ( #19702 )
2019-11-28 18:20:48 +05:30
Shivam Mishra
2512962f55
fix: handle None case for get_shipping_amount_from_rules ( #19723 )
2019-11-28 16:46:58 +05:30
Marica
f51ccbf5d4
chore: Added Quick Stock Balance to Stock Module ( #19726 )
...
- Also 'Stock Balance Report' button no longer primary button
2019-11-28 16:44:46 +05:30
rohitwaghchaure
1511154aa8
fix: removed stock value and account balance out of sync validation ( #19729 )
...
* fix: revert value out of sync feature
* fix: removed stock value and account balance out of sync validation
2019-11-28 16:43:39 +05:30
marination
236140d94c
fix: Division by zero error in Stock Entry
2019-11-28 16:36:24 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard
...
feat: Slides for Onboading Wizard in ERPNext
2019-11-28 14:35:10 +05:30
Rohan Bansal
c59ac36378
fix: use new Contact schema
2019-11-28 12:25:38 +05:30
Rohan Bansal
fd46fef857
fix: add designation to Lead
2019-11-28 12:23:33 +05:30
Rohan Bansal
69e3868a9d
patch: set title for old leads
2019-11-28 12:23:19 +05:30
Rohan Bansal
75da5af900
fix: set missing values
2019-11-28 12:23:05 +05:30
Rohan Bansal
f9e2bfcc29
fix: conditionally set lead title as organization or person
2019-11-28 12:23:05 +05:30
Rohan Bansal
312210c2b0
feat: create address and contact after lead creation
2019-11-28 12:22:47 +05:30
deepeshgarg007
2fe0c98772
fix: Path for quotation expiry method in hooks
2019-11-28 08:09:47 +05:30
Rohan Bansal
c7cfc726d7
feat: navigate to stock ledger from batch report
2019-11-27 18:23:31 +05:30
Anurag Mishra
707bb2052c
fix: Employee dashboard disappear after switching from leave application form ( #19690 )
2019-11-27 16:27:50 +05:30
Marica
f0e87f7fdd
fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' ( #19693 )
2019-11-27 15:49:41 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard
2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c
fix: moved slide json files to respective modules
2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584
feat: moved slide action functions from onboarding utils to doctypes
2019-11-26 15:22:45 +05:30
Rucha Mahabal
195893db0e
fix: conditionally run old patch for Setup Progress
2019-11-26 15:22:05 +05:30
Shivam Mishra
a791170f29
Merge pull request #19475 from 0Pranav/scheduling-ui-rewrite
...
feat: Appointment Schedulling
2019-11-26 13:43:14 +05:30
rohitwaghchaure
b5991e9264
Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12
...
fix: BOM UX
2019-11-26 13:15:40 +05:30
0Pranav
fb1e87710b
Tweaks to success redirect
...
- 5 seconds wait before redirect
- Edited description for URL in settings
2019-11-26 12:14:41 +05:30
0Pranav
8d2b0d800c
Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite
2019-11-26 10:55:53 +05:30
0Pranav
2515022377
add condition for zero appointment slots
2019-11-26 10:55:28 +05:30
Deepesh Garg
5558ee8597
Merge pull request #19591 from 0Pranav/FR-ISS-152101
...
fix: add status "expired" to doctype quotation
2019-11-26 09:08:30 +05:30
Deepesh Garg
31a4fa5dd3
Merge pull request #19606 from deepeshgarg007/shareholder_refactor
...
refactor: Share Transfer code cleanup and refactor
2019-11-26 07:54:57 +05:30
deepeshgarg007
53a66ee386
fix: Method name in hooks, test case code clean up
2019-11-25 21:58:15 +05:30
rohitwaghchaure
0881557c7d
Merge pull request #19636 from rohitwaghchaure/not_able_to_submit_sales_invoice_e_invoice_issue
...
fix: e-invoice issue
2019-11-25 19:24:23 +05:30
Rohit Waghchaure
9326fb78f2
fix: BOM UX
2019-11-25 18:56:18 +05:30
Nabin Hait
ecc6b1917b
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-11-25 18:13:58 +05:30
Nabin Hait
a7d168c05f
fix: merge conflict
2019-11-25 18:12:56 +05:30
Pranav Nachnekar
fc5d8fcd9f
Merge branch 'develop' into scheduling-ui-rewrite
2019-11-25 12:24:32 +00:00
0Pranav
b84e56ebb5
fix:travis tests
2019-11-25 17:32:02 +05:30
0Pranav
565d3efcdf
fetch updated document in test_quotation
2019-11-25 17:11:12 +05:30
Pranav Nachnekar
d63ad3bb5f
fix: add email group and newsletter links to CRM module view ( #19679 )
...
* fix: add email group and newsletter links to CRM module view
* chore: move email group to bottom
2019-11-25 16:50:47 +05:30
0Pranav
f9dec5201f
fix:tests
2019-11-25 16:42:07 +05:30
0Pranav
cf3a2f6579
set transaction date to yesterday
2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b
don't submit quotation
2019-11-25 15:15:00 +05:30
Nabin Hait
4d12f8acab
bumped to version 12.2.0
2019-11-25 15:31:23 +05:50
Nabin Hait
c856cb85d9
log: Change log for v12.2.0
2019-11-25 15:08:47 +05:30
0Pranav
754c43f6c3
fix set_expired_status method
2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282
fix valid date
2019-11-25 14:14:51 +05:30
0Pranav
3ec5eabaf6
formatting
2019-11-25 14:11:31 +05:30
0Pranav
f2752bf38c
fix: tests for python2
2019-11-25 14:09:49 +05:30
Nabin Hait
35e8d1e1d7
Stock acc bal sync msg ( #19676 )
...
* 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
* fix: make journal entry to sync stock and account balance
* fix: translated action label
2019-11-25 14:02:51 +05:30
Mangesh-Khairnar
647331bbd7
feat: add search in category
2019-11-25 13:56:00 +05:30
Rucha Mahabal
7728ae6988
fix: added company letter head slide
2019-11-25 13:23:53 +05:30
0Pranav
a9ff7df2e6
add sql query to set valid_till
2019-11-25 12:55:27 +05:30
Nabin Hait
2fd6814cbf
Merge branch 'marination-account_stock_sync_error' into develop
2019-11-25 12:46:45 +05:30
Nabin Hait
1ed1c4e6a4
fix: make journal entry to sync stock and account balance
2019-11-25 12:33:40 +05:30
Saqib
cd3976f7d2
Asset cancellation fix ( #19671 )
...
* fix: remove asset movement mandatory fields
* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Pranav Nachnekar
04e3a506e4
fix: Primary address not being fetched for customer ( #19667 )
...
* fix: priamry address not being fetched
* add doctype to filter for customer_primary_address
* remove get_customer_primary_address_method
2019-11-25 12:04:00 +05:30
0Pranav
a077795581
fix tests
2019-11-25 12:01:00 +05:30
Rucha Mahabal
00677f334e
fix: user progress code cleanup
2019-11-25 11:58:14 +05:30
0Pranav
eefc492ff4
call commit after sql query for schedular job
2019-11-25 10:51:27 +05:30
marination
737d8a1e26
fix: Added comments
2019-11-25 09:42:08 +05:30
Saqib
c9203a1bee
fix: asset movement ux fixes ( #19637 )
2019-11-22 16:35:15 +05:30
Saqib
f37a46edea
Fixed Asset Refactor Review fixes ( #19665 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1
Fixed Asset Refactor Review fixes ( #19666 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:34 +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
Marica
b5c296da9e
fix: Validation Error message on Prepared Report. ( #19639 )
...
Give the user the reason why he has to use filters.
2019-11-22 14:38:58 +05:30
Marica
7ca472780b
fix: Get Current Stock button not working in Purchase Receipt ( #19645 )
...
- Field visible in grid view as well for better feedback
2019-11-22 14:37:38 +05:30
Anurag Mishra
763660b2e4
fix: set allocated amount in employee advance as per total amount ( #19626 )
2019-11-22 13:32:25 +05:30
0Pranav
6c368e2dfb
submit quotation in test
2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1
Fix sql query in set_expired_status
2019-11-22 12:38:43 +05:30
Mangesh-Khairnar
b10526dd86
fix: consider taxes in the grand total ( #19631 )
2019-11-22 12:28:33 +05:30
thefalconx33
fa42999314
fix: last purchase rate greater than selling price
2019-11-22 12:15:41 +05:30
Saqib
290253fdd0
fix: last purchase rate greater than selling price ( #19617 )
2019-11-22 12:12:29 +05:30
Deepesh Garg
24cde55e28
fix: Patch for updating price or product discount field ( #19642 )
...
* fix: Patch for updating price or product discount field
* fix: Update pactch
* Update update_price_or_product_discount.py
2019-11-22 11:57:42 +05:30
Ben Knowles
49cd19d917
fix: update syntax error in company.js ( #19661 )
2019-11-22 11:36:02 +05:30
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting ( #19656 )
2019-11-22 11:35:14 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting ( #19657 )
2019-11-22 11:34:50 +05:30
Saqib
150c44b350
fix: asset movement ux fixes ( #19641 )
2019-11-22 11:08:35 +05:30
Rucha Mahabal
3cf2c2b3d5
feat: slides for onboarding wizard in ERPNext
2019-11-21 20:47:08 +05:30
Mangesh-Khairnar
1a92eb14ed
fix: Mark attendance from employee attendance tool ( #19627 )
2019-11-21 17:58:18 +05:30
0Pranav
f5112905dc
import make_item method in tests
2019-11-21 13:19:44 +05:30
Rohit Waghchaure
c4e6c42950
fix: e-invoice issue
2019-11-21 11:20:49 +05:30
Rohit Waghchaure
a831848074
fix: code cleanup
2019-11-20 19:42:27 +05:30
Rohit Waghchaure
eed30c6d8c
fix: not able to select item in sales order
2019-11-20 19:42:11 +05:30
0Pranav
4a28144941
add tests
2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7
remove: unused imports
2019-11-20 15:31:13 +05:30
0Pranav
ae90ea9547
fix:travis errors
2019-11-20 15:24:33 +05:30
marination
e537cda062
fix: Added conditional check for conversion factor
2019-11-20 12:38:58 +05:30
0Pranav
682956543e
fix travis
2019-11-20 11:45:14 +05:30
Rucha Mahabal
45e9dd9c51
fix(Journal Entry): default Cash Entry account not getting fetched
2019-11-20 11:40:38 +05:30
0Pranav
fe2147a496
fix travis
2019-11-20 11:37:49 +05:30
0Pranav
dbde140e46
fix: save method of Appointment Booking Setting
2019-11-20 10:30:41 +05:30
0Pranav
c8e66a0f71
Infer number_of_agents from agent_list in apppointment booking settings
2019-11-20 10:27:59 +05:30
rohitwaghchaure
26c46282e8
Merge pull request #19618 from nextchamp-saqib/pos_fix
...
fix: stock qty not displayed in pos
2019-11-19 19:41:25 +05:30
rohitwaghchaure
95270ad14b
Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order
...
fix: not able to select item in sales order
2019-11-19 19:40:11 +05:30
Rohit Waghchaure
248585b5a1
fix: code cleanup
2019-11-19 19:21:27 +05:30
Rohit Waghchaure
c42312ea12
fix: not able to select item in sales order
2019-11-19 19:06:51 +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
Nabin Hait
9db9edca2c
fix(expense claim): fetch outstanding documents based on party account type
2019-11-19 18:44:54 +05:30
rohitwaghchaure
238521c2bd
Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile
...
feat: multiple company pos profile
2019-11-19 18:39:06 +05:30
thefalconx33
353f73a153
fix: stock qty not displayed in pos
2019-11-19 18:37:21 +05:30
Mangesh-Khairnar
c436d93303
fix: reset pos profile when default doesn't exists
2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813
use nowdate instead of date.today()
...
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2019-11-19 12:04:30 +00:00
Mangesh-Khairnar
3f854fce2e
feat: fetch leave approver from both employee and department approvers ( #19613 )
...
* fix: fetch leave approvers from both department and employee master
* fix: creaate a set of approvers
2019-11-19 15:07:30 +05:30
RJPvT
a998978415
fix: pending on review date ( #19609 )
...
* fix: On Specific case if no item code in name
* fix: pending on review date
2019-11-19 14:54:38 +05:30
Joseph Marie Alba
2578d49b84
Correct bug in abbr cause by missing " " separator ( #19605 )
...
Only 1 letter ABBR is generated after typing in a COMPANY NAME separated by spaces. This is due to missing " " value in split method.
For example:
Company Name: ABC Multiple Industries
Generates Abbr: A
Correct Abbr should be: AMI
This is caused by mission " " in split method.
2019-11-19 14:54:09 +05:30
Shivam Mishra
776ff2f75d
fix: query for item group listing ( #19604 )
2019-11-19 14:51:25 +05:30
Mangesh-Khairnar
f3ecfd8e58
fix: fetch leave approvers from both department and employee master ( #19611 )
...
* fix: fetch leave approvers from both department and employee master
* fix: creaate a set of approvers
2019-11-19 14:50:05 +05:30
0Pranav
539ea2cefb
Rename doctype Appointment Booking Slots
2019-11-19 10:59:24 +05:30
0Pranav
b9460ed22c
switched ORM methods for single SQL query
2019-11-19 10:46:07 +05:30
Deepesh Garg
ee69f707a9
Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos
...
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-19 09:47:55 +05:30
deepeshgarg007
0debcf9f2f
fix: Share existing condition logic
2019-11-18 22:12:29 +05:30
deepeshgarg007
9c1c4ef3dd
refactor: Share transfer cancellation and code cleanup
2019-11-18 17:52:19 +05:30
rohitwaghchaure
8131f7657e
Merge pull request #19601 from rohitwaghchaure/fix_set_query_not_working_for_department_field
...
fix: not able to select department in instructor form
2019-11-18 16:40:42 +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
Anurag Mishra
c0d8233a8b
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-18 15:45:53 +05:30
Rohit Waghchaure
39eeac265b
fix: not able to select department in instructor form
2019-11-18 15:20:15 +05:30
Rohit Waghchaure
466702200f
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-18 14:57:55 +05:30
Deepesh Garg
87c6718d90
fix: Book valuation expense in specified account rather than expense included in valuation account ( #19590 )
...
* fix: Book valuation expense in specified accout rather than expense included in valuation account
* fix: Remove undefined variable
* fix: Test cases
* fix: Test Case
2019-11-18 12:34:30 +05:30
Saqib
d995609ffa
Fixed asset refactor ( #19369 )
...
* refactor: Asset Movement with multiple assets using table
* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset
* feat: Auto create asset on Purchase checkbox
* refactor: LCV for asset created via PR/PI
* refactor: get asset category accounts from item master
* refactor: Purchase Receipt for asset purchasing
* refactor: Purchase Invoice for asset purchasing
* fix: post-refactor delete fixes
* refactor: moved asset validation from pr/pi on asset submission
* fix: Asset Category should be defined for auto purchasing assets
* fix: undo serial_no_update removal (for non asset item) from LCV
* fix: remove duplicate calls from item.js
* fix: args position of all occurrence of get_asset_category_account()
* fix: test cases
* fix: landed cost voucher validations
* refactor: test case for auto creation of asset
* fix: removed invalid assertions
* fix: patch errors on travis
* fix: codacy fixes
* fix: PI Items not fetching details from item
* fix: asset movement from list view having default purpose 'Receipt'
* chore: msgprint for selecting item code first while creating asset manually
* fix: alert messages
* minor: asset movement fixes
* fix: lcv was made against submitted assets
* minor: ux fixes
* refac: move specific asset validation to SINV
* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code
* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests
* fix: code review changes
* chore: remove unecessary asset movement updation
* refac: setting latest location while making asset movements
* Added extra validations
* fix: form dashboard make lcv button
* fix: auto asset movement creation validation
* fix: allow lcv against other items after removing submitted assets
* chore: remove unwanted condition
* fix: mismatch debit credit on purchase of asset with valuation tax
* chore: toggle required field based on movement type
* chore: fix lcv error message
* fix: travis failing
* fix: travis failing test
* fix: wrong conditions after merge
* fix: cannot cancel assets
* fix: travis failing* fix change in deletion of assets
* fix: codacy
* fix: process cancellation of assets
* refac: cancellation of pr only deletes auto created assets
* fix: incorrect query
2019-11-18 11:46:55 +05:30
Mangesh-Khairnar
f69b9a8c47
fix: fetch default pos profile user for the company
2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed
Add status expired to doctype quotation
2019-11-15 16:42:32 +05:30
rohitwaghchaure
6424416886
fix: sales order item shwoing incorrect produced qty ( #19584 )
2019-11-15 14:18:45 +05:30
marination
a076bddd83
fix: Show 'Bill of Materials' custom button conditionally
2019-11-15 12:03:06 +05:30
0Pranav
18fda5a571
add appointment list to module page
2019-11-15 11:58:21 +05:30
rohitwaghchaure
16f6ca12a7
Merge pull request #19023 from Alchez/dev-work-order-bugs
...
fix: Work Order operating cost re-calculation on client-side (develop)
2019-11-15 11:19:10 +05:30
rohitwaghchaure
c74c5d5644
Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no
...
fix: stock reconciliation showing incorrect current serial no and qty
2019-11-15 10:17:11 +05:30
deepeshgarg007
57bd1308eb
fix: Validation messages code cleanup
2019-11-15 08:25:48 +05:30
prssanna
74bbcb539f
fix: Ignore period closing voucher entries in accounts dashboard
2019-11-14 22:47:58 +05:30
Mangesh-Khairnar
d545f6fb6b
fix: fetch approver from employee
2019-11-14 19:26:49 +05:30
Rohit Waghchaure
cf55c9c6da
fix: stock reconciliation shwoing incorrect current serial no and qty
2019-11-14 18:22:20 +05:30
Marica
c9e8a1bf96
fix: Account Balance and Stock Value out of sync error message ( #19526 )
...
* fix: Account Balance and Stock Value out of sync error message
Added 'Make Adjustment Entry' button and enhanced message
* fix: Split message and changed routing for translation
2019-11-14 16:13:43 +05:30
rohitwaghchaure
e942f99897
Update work_order.js
2019-11-14 15:26:18 +05:30
Nabin Hait
ec082754b4
fix: One serial no can be tagged in multiple invoices if used against different items ( #19580 )
2019-11-14 13:28:24 +05:30
Deepesh Garg
d69d0e3046
fix(patch): skip leave ledger entry creation for denied leaves ( #19579 )
2019-11-14 13:05:13 +05:30
0Pranav
511780a4d4
feat: configurable redirect on success
2019-11-14 12:47:08 +05:30
Mangesh-Khairnar
fc3b924d4d
fix: skip leave ledger entry creation for denied leaves ( #19556 )
...
* fix: skip leave ledger entry creation for denied leave application
* patch: remove incorrect leave ledger entries
* fix: create reverse ledger entry before setting status to cancel
2019-11-14 12:02:10 +05:30
0Pranav
793ba8fc06
pretty timezone names
2019-11-14 11:25:49 +05:30
Himanshu
5503b6cff5
fix(Task): Do not create/schedule task after project end ( #19184 )
...
* fix: do not create/schedule task after project end
* fix: check difference between dates
* fix: check project date
* fix: task creation
* fix: tests
2019-11-14 10:11:25 +05:30
Saqib
73616d6b33
fix: duplication while bulk creation of item tax template ( #19570 )
2019-11-14 10:09:44 +05:30
Deepesh Garg
95a6320459
Merge pull request #19576 from marination/cwip-patch-fix
...
fix(patch): Enable CWIP Accounting
2019-11-13 22:18:12 +05:30
Himanshu
1ad2d4a962
fix: get tags for rfq ( #19564 )
...
* fix: get tags for rfq
* chore: remove console log
2019-11-13 19:21:52 +05:30
marination
9ffa9d4a64
fix(patch): Enable CWIP Accounting
2019-11-13 19:10:20 +05:30
Mangesh-Khairnar
af7fe1937e
fix: fetch leave approver defined in employee in leave application ( #19559 )
...
* fix: fetch leave approver defined in employee in leave application
* Update department_approver.py
2019-11-13 19:00:56 +05:30
Saqib
3e515e704d
Monthly distribution of depreciation amount ( #19493 )
...
* feat: allow monthly distribution of depreciation amount
* chore: added comments
* fix: monthly depr was not starting from use date's month
2019-11-13 19:00:24 +05:30
rohitwaghchaure
94565d69d1
fix: travis failing ( #19568 )
2019-11-13 18:58:22 +05:30
Nabin Hait
732d6afad5
fix: Show AR summary based on outstanding ( #19573 )
2019-11-13 18:49:23 +05:30
rohitwaghchaure
d064505ebe
fix: incorrect produced qty in the production plan ( #19569 )
2019-11-13 18:17:48 +05:30
rohitwaghchaure
ba8fc21594
fix: merge similar entries for serialized items in stock reconciliation ( #19408 )
2019-11-13 18:11:58 +05:30
Nabin Hait
3a72cb46bc
fix: Set due date in accounts receivable based on payment terms ( #19563 )
2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3
Merge pull request #19567 from deepeshgarg007/balance_sheet_develop
...
fix: Accumulated Values filter disappearing
2019-11-13 17:46:46 +05:30
0Pranav
4006eb5277
Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite
2019-11-13 17:12:24 +05:30
Pranav Nachnekar
ccd9b38463
Merge branch 'develop' into scheduling-ui-rewrite
2019-11-13 11:41:41 +00:00
0Pranav
c31808f5b2
fix margins
2019-11-13 16:47:51 +05:30
0Pranav
6e6954cab8
timezone aware datetime
2019-11-13 16:00:59 +05:30
0Pranav
b1e9fb9e14
fix: buttons on page of appointment scheduling
2019-11-13 15:32:56 +05:30
0Pranav
67f191df4e
padding fixes for timeslot divs
2019-11-13 14:14:10 +05:30
deepeshgarg007
5ea4328359
fix: Accumulated Values filter disappearing
2019-11-13 13:23:49 +05:30
Rohan
4d27b50437
Merge branch 'develop' into dev-work-order-bugs
2019-11-13 13:09:12 +05:30
0Pranav
c72e1f812d
adjust padding for appointment booking
2019-11-13 12:59:05 +05:30
0Pranav
a92f060740
multiple fixes in index.js
2019-11-13 12:13:42 +05:30
0Pranav
f25e2a29f7
fix:formatting
2019-11-13 12:01:36 +05:30
0Pranav
cce000a6d0
remove: commented code
2019-11-13 11:48:37 +05:30
0Pranav
db64c69dac
fix: reference before assignement error
2019-11-13 11:12:38 +05:30
0Pranav
f75ea952e3
Added expired status to quotation
2019-11-13 11:03:53 +05:30
rohitwaghchaure
ffbfaf7099
fix: email digest showing incorrect upcoming events ( #19552 )
2019-11-13 10:59:23 +05:30
Mangesh-Khairnar
06c8129574
fix(batch): fetch company on splitting the batch ( #19558 )
2019-11-13 10:51:43 +05:30
Marica
d00c59830e
feat: Disable CWIP Accounting checkbox added in Company and Asset Category ( #19262 )
...
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category
Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category
* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'
- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered
* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox
* fix(test): Asset
* fix: Asset Test and Patch
* fix(test): Opening Invoice Creation Tool
* Update asset.py
* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
rohitwaghchaure
010714757c
fix: '<' not supported between instances of 'str' and 'NoneType' ( #19553 )
2019-11-12 18:20:07 +05:30
MorezMartin
4fa6194009
feat: [production_plan -> fetching item description] Fetch item description from Material Request or Sales Order ( #19541 )
...
* Change packed item
* Remove description field on update_packed_items
* add possibility to modify description on packed items
* Fetch description from Material Request or Sales Order in production plan, add the possibility to modify the description un production plan
* sync with fork
* Fetch description from Material Request or Sales Order in production plan, Add the possibility to modify description in production plan
* code cleaning syncing fork
* code cleaning syncing fork
* code cleaning syncing fork
* code cleaning syncing fork
* rewied and add item_details.description in case of blank field
2019-11-12 18:19:01 +05:30
Marica
29a2e16f62
fix: Add Serial No. button not responding ( #19550 )
2019-11-12 14:43:41 +05:30
Deepesh Garg
3cc3b57926
fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry ( #19427 )
...
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry
* fix: Codacy
* fix: Minor UX fixes
* fix: Also credit payable amount in case of advance payment
* fix: Against voucher in GL enrty
2019-11-12 14:32:50 +05:30
deepeshgarg007
929676fceb
fix: Validation logic code cleanup
2019-11-12 12:00:30 +05:30
Diksha
39152f935c
fix(employee): show only active employees in the error display while marking a reporting to employee as left
2019-11-11 19:22:51 +05:30
rohitwaghchaure
001ee5ee1b
fix: dictionary changed size during iteration ( #19546 )
2019-11-11 17:43:48 +05:30
Mitchy25
a227b9a9a6
Fix Bank Reconcilaition for Payment Entries ( #19190 )
...
* Fix Bank Reconciliation with Payment Entries
* Update bank_reconciliation.js
2019-11-11 17:29:53 +05:30
ci2014
8b2223ae5f
Move add_custom_button for Gantt and Kanban Board ( #19193 )
...
Move add_custom_button for Gantt and Kanban Board to set_buttons, because in onload it is not working.
2019-11-11 17:27:48 +05:30
Nabin Hait
f997b443e1
Merge branch 'finbyz-develop' into develop
2019-11-11 17:20:28 +05:30
Nabin Hait
4c7ac65db1
fix: Made Campaign for field mandatory
2019-11-11 17:19:52 +05:30
FinByz Tech Pvt. Ltd
88de00fb94
Rendered Email template in email Campaign
2019-11-11 17:17:21 +05:30
Tufan Kaynak
06c6f7cfd3
fix: Currency Exchange for_selling and for_buying on the same day ( #19339 )
...
* fix: test data of Currency Exchange to incluse buying and selling
test data of Currency Exchange to incluse buying and selling
* fix: Currency Exchange Test corrected to include selling and buying exchange_rate
Currency Exchange Test corrected to include selling and buying exchange_rate
* fix: Currency Exchange for_selling and for_buying fields test and functionality restored
In this fix:
* You can now add a separate exchange_rate in date for_selling and for_buying. You could not before because the unique field name was only calculated to allow a single name for a date
* tests did not account for for_selling and for_buying fields and thier uniqueness
* Update test_currency_exchange.py
* Update test_records.json
* fix: update test_records.json
* Update test_records.json
* The basic package for turkey is defined. It is empty now but applications specific to Turkey will be created under that package.
* fix: update code with scapes vs.tabs
updated the code regarding spaces issue
* Update currency_exchange.py
2019-11-11 17:11:16 +05:30
Saurabh
d3ed499854
Merge pull request #19416 from EconCode/shopify-connector-unregisterfix
...
fix: unregistering url wrong formatted string
2019-11-11 17:04:44 +05:30
Nabin Hait
32936024a0
patch: set default for add taxes from item tax template
2019-11-11 15:44:27 +05:30
Nabin Hait
8bd2d4d35e
fix(trial balance): Show opening and closing of group account in single column ( #19509 )
2019-11-11 10:59:20 +05:30
rohitwaghchaure
df75b7693a
fix: added description, uom fields in material request plan item table ( #19463 )
2019-11-11 10:59:10 +05:30
Mangesh-Khairnar
2f44480d69
enhancement: Item-wise sales history report ( #19500 )
...
* refactor(item-wise-sales-history): convert query report to script report
* refactor: add columns, fetch data
* refactor: shift company set func to utils
* fix: add filters
* fix: minor changes
* fix: fetch all the descendants
2019-11-11 10:54:12 +05:30
rohitwaghchaure
090f9a3dc9
Merge pull request #19533 from rohitwaghchaure/fixed_precision_issue_while_updating_qty_and_rate
...
fix: precision issue
2019-11-08 14:54:58 +05:30
rohitwaghchaure
b81942404d
fix: incorrect balance qty in stock ledger if batch filter set ( #19479 )
2019-11-08 14:50:48 +05:30
rohitwaghchaure
d36c6068b2
fix: 'NoneType' object has no attribute 'stock_uom' ( #19532 )
2019-11-08 14:43:53 +05:30
Rohit Waghchaure
e93dc9f1cd
fix: precision issue
2019-11-08 13:43:15 +05:30
Deepesh Garg
7a23057eab
feat: Enhancement in landed cost voucher ( #19252 )
...
* feat: Enhancement in landed cost voucher
* fix: Make GL entries based on ledgers in Landed cost voucher
* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry
* fix: Ability to select expense account in Stock Entry
* fix: Renaming and test case fixes
* fix: Test Cases
* fix: Additional cost in Stock Entry
* fix: Changed filters and test case fixes
* fix: Upadte filters in stokc entry expense account filter
* fix: company filter
2019-11-08 12:52:54 +05:30
Deepesh Garg
7aef9f3b43
fix: Accounting Dimension custom fields should be admin owned ( #19525 )
...
* fix: Accounting Dimension custom fileds should be admin owned
* fix: Update query
* fix: Travis
2019-11-08 12:42:38 +05:30
Deepesh Garg
a839510b33
Merge pull request #19528 from deepeshgarg007/gst_check_digit_msg
...
fix: GSTIN validation msg fix
2019-11-07 23:05:23 +05:30
deepeshgarg007
62fbf37eb4
fix: GSTIN validation msg fix
2019-11-07 21:54:25 +05:30
deepeshgarg007
015285c42f
fix: Exception handling in GSTR-1 Report
2019-11-07 19:38:52 +05:30
Rucha Mahabal
b455318f01
fix(Integration): Woocommerce issues ( #19487 )
...
* fix: Delivery URL returned response code 500
* fix: set default company in Woocommerce Settings
* fix: remove redundant function calls
* fix: make offset configurable for delivery date in sales order
* fix: remove redundant code from woocommerce_settings.py
* fix: import create_custom_field
* fix: added ignore_mandatory for saving item, customer and sales order
* fix: remove unused woocommerce_check custom field
* fix: do not delete custom fields or item group when sync is disabled
2019-11-07 18:20:32 +05:30
Nabin Hait
628701f1a5
fix: Accounts mandatory depending on share transfer type ( #19523 )
2019-11-07 18:05:40 +05:30
Himanshu
bac50bc295
fix: remove validate for issue priority ( #19522 )
2019-11-07 18:04:50 +05:30
Saurabh
28c6a0aeb1
fix: reload global defaults ( #19517 )
2019-11-07 14:16:26 +05:30
0Pranav
83100c9c84
Add comemnts for tz conversions
2019-11-07 13:37:11 +05:30
0Pranav
0671ea8137
use frappe.Redirect instead of DoesNotExistError
2019-11-07 13:31:56 +05:30
0Pranav
76b20a5fa4
crack some one liners
2019-11-07 13:24:59 +05:30
rohitwaghchaure
15382a6f71
Merge pull request #19518 from sahil28297/fix_cart
...
fix(cart): return rule instead of rule_label_map
2019-11-07 13:03:41 +05:30
Marica
52d888de42
fix[minor]: Payment Entry status patch ( #19519 )
2019-11-07 13:01:45 +05:30
0Pranav
151853b887
remove unneccessary imports
2019-11-07 12:55:43 +05:30
0Pranav
51208b3f0b
fix:formatting
2019-11-07 12:54:48 +05:30
Marica
e37a67245e
fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note ( #19388 )
2019-11-07 12:52:23 +05:30
0Pranav
75db6f7073
convert indentation to tabs
2019-11-07 12:47:00 +05:30
Sahil Khan
1c44bb0982
fix(cart): return rule instead of rule_label_map
2019-11-07 12:38:05 +05:30
0Pranav
fce8f36bb2
don't change lead if assigned
2019-11-07 12:37:28 +05:30
theopen-institute
36520ef951
fix: Add a setting to make creation of new Student User optional ( #19122 )
...
* New setting to skip Student User creation
* Allow skip of new User creation via settings
2019-11-06 19:09:15 +05:30
Raffael Meyer
edba06038e
feat(regional): enable transaction log for germany ( #19198 )
2019-11-06 19:07:04 +05:30
Mitchy25
a5776d16b4
fix: Version 12 Bank Reconciliation fix ( #19182 )
...
* Fix Bank Reconciliation
Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters
* Update bank_reconciliation.js
Removing incorrect fix to filters.
Filters are loaded from Bank Transaction List.
* Update bank_reconciliation.js
2019-11-06 19:04:54 +05:30
Suraj Shetty
7508896bfb
perf: Optimise BOM Update Tool ( #19236 )
...
* perf: Optimize BOM update tool
- Remove redundant traverse_tree calls
- Cache bom_children data
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replace get_list with db.sql
* fix: Enable versioning for updated BOM
* fix: Directly save doc_before_save from bom obj instead of using load_doc_before_save
* fix: recurssion check performance issue
2019-11-06 18:46:57 +05:30
Mangesh-Khairnar
a709ae894c
feat: duplicate linked task in project ( #19271 )
...
* feat: create a duplicate project
* fix: allow duplication via form
* feat: fetch old task and link project
* fix: link task with project
* fix: parse json string as python object
* fix: avoid duplicate task based on the project template
* fix: ask user for the new project name
* fix: display a descriptive message on switching to a new route
* fix: override duplicate in menu
* fix: check for duplicate project name after submitting prompt
* fix: set the project template
* fix: minor changes
* fix: function call
* refactor: add a separate button for duplicate
* Update project.js
2019-11-06 18:20:06 +05:30
Deepesh Garg
02b9472152
Merge pull request #19490 from prssanna/dashboard-fix
...
fix: fix dashboard with date range
2019-11-06 18:17:08 +05:30
Marica
1beed7db72
fix: Added 'status' field in Payment Entry ( #19507 )
2019-11-06 18:12:29 +05:30
Shivam Mishra
d743583bf4
fix: contact creation and fetching for shopping cart ( #19510 )
2019-11-06 18:03:03 +05:30
rohitwaghchaure
0c12eded05
Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report
...
fix: unknown column credit limit in accounts receivable report
2019-11-06 17:26:35 +05:30
Gavin D'souza
5a31e22892
chore: frappe.rename_doc update
2019-11-06 17:03:12 +05:30
Deepesh Garg
f67833f249
Merge pull request #19492 from gavindsouza/invoice-creation-tool-py3
...
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-06 16:40:04 +05:30
rohitwaghchaure
6a50c92087
Update accounts_receivable.js
2019-11-06 16:34:17 +05:30
rohitwaghchaure
e123ec6b45
fix: incorrect number of entries while making deferred revenue entry ( #19473 )
2019-11-06 15:25:00 +05:30
Saqib
01c19d3b93
internal issues ( #19496 )
...
* fix: user remark mandatory in quick entry but not in form
* fix: preview salary slip btn showing in draft and unsaved states
* minor: removed unecessay comma
* fix: department analytics report showing departments of all companies
2019-11-06 14:41:16 +05:30
Rohit Waghchaure
dec5bead9c
fix: unknown column credit limit in accounts receivable report
2019-11-06 13:13:31 +05:30
0Pranav
6f1d2eeffd
changes to suggestions made by shivam
2019-11-06 11:57:37 +05:30
Rohan
f527713b89
Merge branch 'develop' into dev-work-order-bugs
2019-11-06 11:39:24 +05:30
0Pranav
d1ee962d4b
seperate function for sending confirmation
2019-11-05 14:53:36 +05:30
Rohit Waghchaure
730c8a145d
minor: code cleanup
2019-11-05 12:46:52 +05:30
Pranav Nachnekar
4d3dc87a1a
Apply suggestions from code review
...
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-11-05 04:32:06 +00:00
marination
075f6ea0d5
feat: Provision to fetch items from BOM in Stock Entry
...
Items are populated in child table and amounts are calculated
Warehouse Fields in popup toggle based on Stock Entry Type
2019-11-04 21:58:13 +05:30
Prssanna Desai
167aa7655d
Merge branch 'develop' into dashboard-fix
2019-11-04 15:42:20 +05:30
Gavin D'souza
05710804cf
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-04 14:45:11 +05:30
prssanna
7e2b030052
fix: fix dashboard with date range
2019-11-04 13:07:27 +05:30
Diksha
7091a2102c
fix(sales order): rename delivery to delivery note on sales order make button
2019-11-04 12:03:35 +05:30
Pranav Nachnekar
af18b2cdc5
Merge branch 'develop' into scheduling-ui-rewrite
2019-11-04 04:38:59 +00:00
Deepesh Garg
b565e9ba64
Merge pull request #19309 from sagargharge/develop
...
fix: restricted duplicate guardians on student doctype (#19194 )
2019-11-04 09:04:29 +05:30
Mangesh-Khairnar
e3bc213262
feat: multiple company pos profile
2019-11-01 22:35:08 +05:30
rohitwaghchaure
475d8e3cdc
Merge pull request #19477 from rohitwaghchaure/production_plan_warehouse_not_changed
...
fix: Wrong warehouse fetched in production plan
2019-11-01 16:46:46 +05:30
Deepesh Garg
0bcf8b64f6
Merge pull request #19422 from marination/search-field
...
fix: Search field entries included in Item Link field query
2019-11-01 15:38:25 +05:30
Rohit Waghchaure
1bb5d01192
fix: Wrong warehouse fetched in production plan
2019-11-01 14:24:21 +05:30
Deepesh Garg
ebf46120ba
Merge pull request #18985 from Alchez/dev-serial-no-statuses
...
feat: add statuses for Serial No
2019-11-01 14:16:45 +05:30
0Pranav
e573bd9074
remove unnecessary variable
2019-11-01 12:47:11 +05:30
0Pranav
53ec8c6322
Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite
2019-11-01 12:40:08 +05:30
deepeshgarg007
c82aed0718
fix: Add missing semicolon
2019-11-01 12:36:33 +05:30
0Pranav
97f6576213
prettify confirmation email
2019-11-01 12:36:06 +05:30
0Pranav
54f33f4e5d
move utility functions
2019-11-01 12:14:21 +05:30
0Pranav
3609872760
rename function
2019-11-01 12:06:42 +05:30
Deepesh Garg
9378aacbe5
Merge pull request #17151 from Alchez/develop-company-address-label
...
fix(selling): Add missing label to company address field
2019-11-01 11:56:08 +05:30
0Pranav
6de68c8671
avoid repetition on get_form date
2019-11-01 09:51:32 +05:30
0Pranav
957c9f5ff0
fix:comments
2019-11-01 09:36:45 +05:30
0Pranav
4701bc8bfc
Add ignore permissions for opportunity
2019-11-01 09:36:29 +05:30
Deepesh Garg
3cbd70a1d9
Merge pull request #19316 from joelios/develop
...
fix: Unable to create timesheet from project dashboard
2019-10-31 23:28:13 +05:30
Deepesh Garg
2ec7acb592
Merge pull request #19294 from vijaywm/duplicate-attendance
...
fix: Typo in attendance date filter
2019-10-31 16:46:52 +05:30
Ashish Shah
28710cdf99
fix: coupon code changes suggested by prasad ( #19352 )
...
* changes suggested by prasad
* codacy correction
2019-10-31 16:09:06 +05:30
Mangesh-Khairnar
45c18b3184
fix: fetch employee department ( #19433 )
2019-10-31 16:00:52 +05:30
Suraj Shetty
519ca54f53
feat: Show timesheets related to customer's projects on customer portal ( #19443 )
...
* fix: Show timesheets related to customer's projects on customer portal
* style: fix codacy
2019-10-31 16:00:04 +05:30
Suraj Shetty
77e4cf89f8
fix: Pass parent_acc_name ( #19450 )
2019-10-31 15:57:31 +05:30
deepeshgarg007
4a1d000c33
fix: Test Case
2019-10-31 15:57:15 +05:30
rohitwaghchaure
81c217584a
fix: purchase order issue, margin_rate_or_amount not there in the purchase documents ( #19466 )
2019-10-31 15:56:10 +05:30
Anurag Mishra
a11e738801
feat: Stock value and account balance sync. ( #19233 )
...
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
2019-10-31 15:55:03 +05:30
0Pranav
e494144c96
merge settings fetch, add helpers
2019-10-31 15:38:39 +05:30
0Pranav
60093d98b0
auto assign before creating event
2019-10-31 15:37:57 +05:30
0Pranav
d1c530c564
fix: merge settings into one call
2019-10-31 15:36:33 +05:30
gavin
450da16dc2
Merge branch 'develop' into hooks-update
2019-10-31 11:26:37 +05:30
rohitwaghchaure
139c20a736
Merge pull request #19454 from rohitwaghchaure/fix_item_price_stock_report_not_working_v12
...
fix: item price stock report not working
2019-10-30 22:30:10 +05:30
marination
1e754b161c
fix: Fetching catched meta and removed description fetch from Search Fields
...
Description is conditionally fetched and also used in WHERE clause, that is maintained.
Improved naming
2019-10-30 18:33:44 +05:30
gavin
8ed6772727
Merge branch 'develop' into hooks-update
2019-10-30 17:52:36 +05:30
gavin
ad04d442a1
Merge pull request #19442 from 0Pranav/maintainance-ux-fix
...
fix: maintenance schedule ux
2019-10-30 17:51:55 +05:30
rohitwaghchaure
6bd6039496
Revert "fix: patch, item tax template showing 'Untitled' in the name"
2019-10-30 17:37:22 +05:30
Pranav Nachnekar
c02cb6ca94
Merge branch 'develop' into maintainance-ux-fix
2019-10-30 11:15:44 +00:00
rohitwaghchaure
1545ee914a
Merge pull request #19432 from rohitwaghchaure/showing_untitled_name_in_item_tax_template
...
fix: patch, item tax template showing 'Untitled' in the name
2019-10-30 16:33:56 +05:30
rohitwaghchaure
7b6ab9738d
Merge pull request #19446 from rohitwaghchaure/not_able_to_select_project_in_work_order
...
fix: not able to select the project in the work order
2019-10-30 16:32:34 +05:30
Rohit Waghchaure
d8b64cd199
replaced frappe.db.sql with frappe.get_all
2019-10-30 16:27:58 +05:30
Rohit Waghchaure
2e01573a40
fix: item price stock report not working
2019-10-30 16:22:30 +05:30
Deepesh Garg
fac4eb919b
Merge pull request #19445 from scmmishra/typo-fix
...
fix: typo in production plan
2019-10-30 16:03:56 +05:30
gavin
e0348c9ec8
Merge branch 'develop' into hooks-update
2019-10-30 15:46:46 +05:30
Pranav Nachnekar
66e5e16a2e
Merge branch 'develop' into maintainance-ux-fix
2019-10-30 09:54:47 +00:00
Gavin D'souza
d38f5374cb
chore: moved email digest to long job
2019-10-30 14:43:58 +05:30
Mangesh-Khairnar
83c7b5b44b
fix(bom): maintain a default bom for an item ( #19407 )
2019-10-30 14:25:50 +05:30
Mangesh-Khairnar
7638788c2f
fix: calculate pending leaves ( #19411 )
2019-10-30 14:23:41 +05:30
Rohit Waghchaure
486a8f67a4
fix: not able to select the project in the work order
2019-10-30 14:22:49 +05:30
Anurag Mishra
5c9d92eabf
fix: On Specific case if no item code in name ( #19419 )
2019-10-30 14:18:16 +05:30
Shivam Mishra
afa03fd654
Merge branch 'develop' into typo-fix
2019-10-30 14:08:20 +05:30
Shivam Mishra
d8abac3278
fix: typo in production plan
2019-10-30 14:06:56 +05:30
0Pranav
c8333d4b41
fix: codacy
2019-10-30 13:48:01 +05:30
0Pranav
07b74533fe
fix: error message matches field name
2019-10-30 13:47:49 +05:30
Faris Ansari
e127d937f7
fix(ExpenseClaim): List filter config for Rejected and Unpaid ( #19434 )
2019-10-30 13:31:05 +05:30
0Pranav
da5bf5a7c4
fix:indentation
2019-10-30 11:24:58 +05:30
0Pranav
be5c6e7aec
fix:readability
2019-10-30 11:14:49 +05:30
0Pranav
0f0d6ce25c
Remove doctype related to appointment scheduling
2019-10-30 11:08:09 +05:30
0Pranav
846c03889e
fix: hide schedule section on new forms
2019-10-30 10:51:25 +05:30
0Pranav
d2d0100c9a
fix:better error message when sales person is none
2019-10-30 10:48:13 +05:30
0Pranav
abbc08cb48
fix: hide generate schedule button on new forms
2019-10-30 10:46:16 +05:30
ahmadRagheb
2a72d1fee4
Update salary_slip.py
...
getdate imported twice
2019-10-29 19:49:08 +02:00
Rohit Waghchaure
b051fa37df
fix: patch, item tax template showing 'Untitled' in the name
2019-10-29 14:56:03 +05:30
Faris Ansari
bcf107b9f7
chore: fix unexpected keyword in shopify_settings ( #19430 )
...
chore: fix unexpected keyword in shopify_settings
2019-10-29 14:25:37 +05:30
Deepesh Garg
118f2c7d64
Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status
...
fix: sync delivery note status in both list view and form view
2019-10-29 14:17:38 +05:30
Chinmay D. Pai
702f9f929b
chore: rename undefined variable in shopify_log
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-29 13:30:13 +05:30
Chinmay D. Pai
4f7885f1aa
chore: fix unexpected keyword in shopify_settings
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-29 13:20:17 +05:30
rohitwaghchaure
3270ba6d8c
Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12
...
fix: 'NoneType' object is not iterable
2019-10-29 11:30:22 +05:30
Rohan
8728e94dbd
Merge branch 'develop' into develop-company-address-label
2019-10-29 11:26:00 +05:30
Rohan
379f38e1cd
Merge branch 'develop' into dev-work-order-bugs
2019-10-29 11:25:53 +05:30
Rohan
fba7cae2c9
Merge branch 'develop' into dev-serial-no-statuses
2019-10-29 11:25:36 +05:30
Rohit Waghchaure
88d2c97391
fix: default accounts are not added on creation of company
2019-10-28 17:50:31 +05:30
Anurag Mishra
07b908c0c5
patch: Missing Patch for item Tax template
2019-10-28 16:00:24 +05:30
marination
3dbef9de74
fix: Search field entries included in Item Link field query
2019-10-28 15:48:10 +05:30
Rohit Waghchaure
8916916a03
fix: 'NoneType' object is not iterable
2019-10-28 13:00:18 +05:30
Deepesh Garg
9942fcc8cb
fix: Better validation msg for difference account in Stock Entry ( #19400 )
...
* fix: Better validation msg for difference account
* fix: Make primary info bold
2019-10-28 12:08:31 +05:30
Suraj Shetty
83b58352ce
fix: Overwrite default cost center if item has default cost center set. ( #19405 )
2019-10-28 12:05:30 +05:30
Deepesh Garg
a8358f0342
Merge pull request #19415 from frappe/jaichavan-fix-typo
...
fix: typo in Budget Variance Report
2019-10-27 18:39:23 +05:30
Shivam Mishra
5e14660dda
Merge branch 'develop' into revert-19265-issue_fix
2019-10-27 17:36:08 +05:30
Sahil Khan
e6f86c934d
bumped to version 12.1.8
2019-10-26 20:22:19 +05:50
EconCode
07ae3abf34
fix: unregistering url wrong formated string
...
Fixed the formated string for unregistering webhooks.
String should look like:
"/admin/api/2019-04/webhooks/#{webhook_id}.json"
Taken from shopify api documentation - deleting webhooks:
https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04
2019-10-26 16:31:29 +02:00
Sahil Khan
ce5200d700
bumped to version 12.1.7
2019-10-26 19:56:06 +05:30
Jai Chavan
9f483c1fa9
fix: Spelling of Variance
2019-10-26 18:45:01 +05:30
Suraj Shetty
8f67ef8a75
fix: Add patch to replace accounting with accounts in home_settings
2019-10-25 18:55:57 +05:30
Deepesh Garg
09a6868ccd
Merge pull request #19390 from 0Pranav/patch-1
...
fix: setting incorrect field for party bank account
2019-10-25 12:24:39 +05:30
Ashish Shah
e1f95c0529
fix: allow_items_not_in_stock should be evaluated ( #19398 )
2019-10-25 12:16:11 +05:30
0Pranav
8c1b88f156
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-10-25 11:45:03 +05:30
Aditya Hase
7bdc612013
chore: Update module name ( #19404 )
2019-10-24 18:01:58 +05:30
Mangesh-Khairnar
233c0bc779
fix: sync delivery note status in both list view and form view
2019-10-24 15:46:12 +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
Rohan
962f4eb96c
Merge branch 'develop' into develop-company-address-label
2019-10-23 15:57:26 +05:30
Pranav Nachnekar
d5166861de
fix:setting incorrect field for party bank account
...
Previously
Corrected
2019-10-23 07:46:00 +00:00
Deepesh Garg
d9e27b727f
Merge branch 'develop' into item_row_link_issue
2019-10-23 12:20:19 +05:30
Deepesh Garg
275f3f8b91
Merge pull request #19320 from deepeshgarg007/demo-fixes
...
fix: Demo Script fixes
2019-10-23 12:17:08 +05:30
Deepesh Garg
3f96306986
Merge pull request #19375 from khushalti/develop
...
fix: date validation, setting up default company, customer/supplier manadatory property on Blanket Order
2019-10-23 12:11:13 +05:30
rohitwaghchaure
5ff377e2bb
fix: product link not working in website ( #19373 )
2019-10-23 11:09:21 +05:30
deepeshgarg007
799f8d4f93
Merge branch 'develop' of https://github.com/frappe/erpnext into demo-fixes
2019-10-23 08:47:11 +05:30
Deepesh Garg
36c97c3128
Merge pull request #19385 from ruchamahabal/fix_moduleview
...
fix: custom doctypes and reports not visible in Accounts module view
2019-10-22 17:34:38 +05:30
Deepesh Garg
453ad3c155
Merge branch 'develop' into develop
2019-10-22 17:30:13 +05:30
Shivam Mishra
85c028b60d
Merge branch 'develop' into revert-19265-issue_fix
2019-10-22 17:26:54 +05:30
Rohan
ee5f0f7c30
Merge branch 'develop' into dev-work-order-bugs
2019-10-22 17:12:00 +05:30
Rohan
8522fdc99c
Merge branch 'develop' into dev-serial-no-statuses
2019-10-22 17:11:30 +05:30
Nabin Hait
bd6b1806cd
fix: fixed asset register report and made skip-dn field hidden
2019-10-22 14:28:37 +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
Rucha Mahabal
b5bd3f3abf
fix: custom doctypes and reports not visible in Accounts module view
2019-10-22 13:38:36 +05:30
Nabin Hait
bebbc6371b
fix: Validation message in work order
2019-10-22 12:35:28 +05:30
0Pranav
d583e412c9
Add generic 'Appointment' doctype
2019-10-22 12:33:09 +05:30
Saurabh
bdc899857c
Fix: Shopify payload operations logging ( #19366 )
...
* fix: payload logging for shopify
* fix: remove print statements
2019-10-22 12:31:56 +05:30
Anurag Mishra
b7e9e2a1a5
fix: if naming if item-code and index both are same ( #19371 )
2019-10-22 11:47:03 +05:30
Anurag Mishra
eaff541349
fix: query ( #19376 )
2019-10-22 11:46:17 +05:30
Deepesh Garg
a324be86d2
Merge branch 'develop' into develop
2019-10-21 21:23:23 +05:30
Khushal Trivedi
e22ca23b81
fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order
2019-10-21 18:17:42 +05:30
gavin
ed8e3b3786
fix: link field country in shopping cart ( #19370 )
2019-10-21 18:12:29 +05:30
Khushal Trivedi
ad71307a5e
fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order
2019-10-21 17:46:35 +05:30
Khushal Trivedi
ce5c2d8682
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-10-21 17:36:19 +05:30
Khushal Trivedi
cdebd400ec
[Fix] - changed codacy changers suggested
2019-10-21 16:29:16 +05:30
Saurabh
48eff90d1f
fix: Don't show make jv button if equity or liability account and asset account not specified ( #19350 )
2019-10-21 16:03:28 +05:30
Deepesh Garg
c58d7d8a98
Merge pull request #19363 from rohitwaghchaure/stock_balance_report_not_working_for_stock_recon
...
fix: stock balance report not working if actual qty is zero
2019-10-21 15:52:40 +05:30
Deepesh Garg
fbae893f07
Merge pull request #19306 from nabinhait/required_date_fix
...
fix: Always set required date based on min date on item table
2019-10-21 15:25:23 +05:30
Rohit Waghchaure
432b03572a
fix: stock balance report not working if actual qty is zero
2019-10-21 13:42:54 +05:30
Abdulla P I
4f4e490d53
fix(HR):adding is_compensatory as default in setup ( #19307 )
2019-10-21 13:42:17 +05:30
Nabin Hait
dfc10bb5ae
fix: Fixed consumed qty based on Stock Ledger Entry ( #19305 )
...
* fix: Fixed consumed qty based on Stock Ledger Entry
* Update itemwise_recommended_reorder_level.py
2019-10-21 13:41:42 +05:30
Nabin Hait
dd893254be
Update buying_controller.py
2019-10-21 13:40:00 +05:30
Nabin Hait
f2d37a7280
fix: Removed inter-company account filter for inter-company journal entry ( #19308 )
2019-10-21 13:36:47 +05:30
Nabin Hait
8232bd01d6
fix: Positive qty in sales return print ( #19310 )
2019-10-21 13:36:26 +05:30
Nabin Hait
49a46f08de
fix: Set gross profit in SO item on updating rate after submission ( #19311 )
2019-10-21 13:35:43 +05:30
Frappe PR Bot
75c5c89909
feat: Updated translation ( #19329 )
2019-10-21 13:34:14 +05:30
Mangesh-Khairnar
cdf15222e1
fix: half day leave ( #19323 )
2019-10-21 13:33:46 +05:30
Deepesh Garg
6208755d54
fix: Unable to add details in quotation and opportunity ( #19354 )
2019-10-21 13:29:44 +05:30
Deepesh Garg
4821f38d25
fix: Item Price changes are not persistent after updating cost on submitted BOM ( #19356 )
2019-10-21 13:27:40 +05:30
rohitwaghchaure
717ad388be
Merge pull request #19319 from deepeshgarg007/asset-fixes-1
...
fix: Value after depreciation fixes in asset
2019-10-21 12:16:16 +05:30
Deepesh Garg
721c381df3
Merge branch 'develop' into develop
2019-10-20 18:15:58 +05:30
deepeshgarg007
737ec6b26e
fix: Travis
2019-10-20 17:36:36 +05:30
Mohamud Amin Ali
871193eb62
fix: removed annotations altogether for bmi
2019-10-20 11:50:15 +03:00
Mohamud Amin Ali
02279dff31
fix: appropriate annotations in BMI
2019-10-20 10:46:45 +03:00
Mohamud Amin Ali
43b22b4473
fix: a more legible chart for vitals
2019-10-20 10:34:39 +03:00
Deepesh Garg
c8d9a5305b
Merge branch 'develop' into revert-19265-issue_fix
2019-10-20 12:18:34 +05:30
Deepesh Garg
06ace23a32
Merge pull request #18200 from alyf-de/datev_report_headers
...
feat(regional): enable automatic processing of DATEV reports
2019-10-19 22:56:59 +05:30
mudux
0d7359a826
fix: Vitals chart not diplaying
2019-10-19 11:10:42 +03:00
deepeshgarg007
55eff16760
fix: Value after depreciation fixes in asset,
...
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2019-10-19 12:16:25 +05:30
Deepesh Garg
dcb9c2031b
Merge branch 'develop' into datev_report_headers
2019-10-19 11:34:57 +05:30
Khushal Trivedi
d02b026a4d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-10-18 17:04:26 +05:30
Khushal Trivedi
8750caa8e3
[Fix] - if its not multi company set it by default on BO
2019-10-18 17:01:16 +05:30
Rohan Bansal
83740de636
fix(selling): Add missing label to company address field
2019-10-16 15:16:00 +05:30
Rohan
d389ee457c
Merge branch 'develop' into dev-work-order-bugs
2019-10-16 15:08:58 +05:30
Rohan
a77f534f7c
Merge branch 'develop' into dev-serial-no-statuses
2019-10-16 15:08:57 +05:30
Khushal Trivedi
5f4b6d267c
[Fix] - making customer/supplier field manadatory on order type condition on BO
2019-10-16 13:40:58 +05:30
Khushal Trivedi
7084f07dab
[Fix] - making customer/supplier field manadatory on order type condition on BO
2019-10-16 13:40:33 +05:30
Khushal Trivedi
1675181e49
[Fix] - making customer/supplier field manadatory on order type condition on BO
2019-10-16 12:02:56 +05:30
Khushal Trivedi
01f8a4966a
[Fix] - making customer/supplier field manadatory on order type condition
2019-10-16 11:40:27 +05:30
ashish-greycube
c41e44d964
fix: relative link in href
2019-10-16 10:38:31 +05:30
ashish-greycube
a32618dff4
add coupon code on selling card of desk
2019-10-16 10:26:25 +05:30
Shivam Mishra
8aa0a280b2
Revert "fix: Allow disabled links in issue doctype ( #19265 )"
...
This reverts commit 29a5756f87
2019-10-15 19:17:20 +05:30
deepeshgarg007
3db65ef7e8
fix: Demo Script
2019-10-15 19:16:45 +05:30
joelios
441720df75
fix: linking of time_log to timesheet from project (frappe/erpnext #19315 )
2019-10-15 15:42:51 +02:00
0Pranav
ad013264eb
fix:margins
2019-10-15 16:45:37 +05:30
0Pranav
7c27436d21
fix:visibilty for forms
2019-10-15 16:45:24 +05:30
0Pranav
2f9ef85614
fix:typo
2019-10-15 16:44:28 +05:30
0Pranav
3d73a4f944
fix:readability for user
2019-10-15 16:43:40 +05:30
0Pranav
29c7d5fc63
fix:margins
2019-10-15 16:43:18 +05:30
Kenneth Sequeira
c269c68727
fix: allow read-only on new address form ( #19304 )
2019-10-15 16:34:55 +05:30
Khushal Trivedi
e2bb950012
[fix] - from date cannot be greater than to date on blanket order
2019-10-15 15:03:13 +05:30
Rohit Waghchaure
a20fb650fe
code cleanup
2019-10-15 14:42:09 +05:30
Sagar Gharge
f935e37925
[Fix] restricted duplicate guardians on student doctype ( #19194 )
2019-10-15 14:38:04 +05:30
Rohit Waghchaure
66072fec5a
fixed conflicts
2019-10-15 14:18:59 +05:30
Nabin Hait
19070621af
tests: added tests for PO scheduled date
2019-10-15 14:11:40 +05:30
Nabin Hait
a113861b0c
fix: Always set required date based on min date on item table
2019-10-15 12:43:27 +05:30
ashish-greycube
cf24191fe5
feat: affiliate sales partner referral code and coupon code
2019-10-15 11:44:45 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
rohitwaghchaure
0bb99c15e5
fix: while submitting landed cost voucher user getting negative stock error ( #19269 )
2019-10-14 15:18:36 +05:30
Vijaya Raghavan
adc1529567
fixed typo
...
fixes type in filter parameter
2019-10-13 21:41:02 +05:30
deepeshgarg007
683a89a415
fix: Chart fix in Analytics report
2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
4ed9b45fb8
feat(Sales Order): Allow to skip delivery note creation ( #19222 )
...
* feat(sales-order): add option to skip delivery note creation for order type maintenance
* fix(sales-order): hide delivery date on setting skip delivery note creation
* fix: allow skipping delivery note for all order types
* fix: bypass delivery note creation on setting skip delivery note creation
* fix: show skip delivery note in list view
* fix: check for duplicate project name after submitting prompt
* fix: toggle delivery note reqd for skip delivery note
* fix: update status based on skip delivery note
2019-10-12 19:33:11 +05:30
rohitwaghchaure
86870b0aa6
fix: production plan not showing grand total against sales order ( #19283 )
2019-10-12 16:49:38 +05:30
rohitwaghchaure
a0c162c2d6
fix: project has not set in the sub assembly work order from production plan ( #19284 )
2019-10-12 16:48:57 +05:30
Anurag Mishra
8e937e9640
fix: packed items child table reset on amending docs ( #19157 )
2019-10-11 11:50:38 +05:30
Saqib
66762380ed
fixes: internal issues ( #19201 )
...
* fix: Delivery Trip now has editable start address.
* fix: default party type not set in Journal Entry
* fix: maintainence visit purpose table not fetching item name
* fix: maintainence visit purpose table not fetching item name
2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
1d781f13b2
fix: fetch allocated amount for individual invoice ( #19259 )
2019-10-11 11:06:11 +05:30
Deepesh Garg
29a5756f87
fix: Allow disabled links in issue doctype ( #19265 )
...
* fix: Allow disabled links in issue doctype
* fix: Remove unwanted attribute
2019-10-11 11:04:48 +05:30
rohitwaghchaure
285344eb0e
fix: over-bill error while making debit note against purchase return e… ( #19270 )
...
* fix: overbill error while making debit note against purchase return entry
* Update accounts_controller.py
2019-10-11 11:02:11 +05:30
Marica
f067447d9c
fix: Margin and Discount percentage set correctly via 'Update Items' ( #19276 )
2019-10-11 10:47:09 +05:30
sahil28297
39d9cbc43d
fix(patch): use db_insert instead of save to escape validations ( #19279 )
2019-10-11 10:43:50 +05:30
Deepesh Garg
2d064ee67a
fix: Remove bold property from disable checkbox ( #19280 )
2019-10-11 10:43:38 +05:30
Himanshu
eba3a8e802
fix: get contact details ( #19281 )
2019-10-11 10:43:24 +05:30
Deepesh Garg
0fde204074
Merge pull request #19278 from Mangesh-Khairnar/fix-fixed-asset-register-name
...
fix: change category name from in store to in location
2019-10-11 09:14:46 +05:30
Kenneth Sequeira
a54b7542f1
fix: sales invoice labels ( #19267 )
2019-10-10 18:50:39 +05:30
Rohan
d8cbbc7d65
Merge branch 'develop' into dev-work-order-bugs
2019-10-10 17:47:31 +05:30
Rohan
6c8fe5ae02
Merge branch 'develop' into dev-serial-no-statuses
2019-10-10 17:47:30 +05:30
Mangesh-Khairnar
9cf818d347
fix: change category name from in store to in location
2019-10-10 14:28:52 +05:30
Suraj Shetty
a6e53410b0
Merge branch 'develop' into not_able_to_use_webhook
2019-10-10 14:22:48 +05:30
Rohit Waghchaure
4494d46020
fix: name 'link_link_doctype' is not defined
2019-10-10 14:17:06 +05:30
rohitwaghchaure
95161a0df4
Merge pull request #19266 from rohitwaghchaure/fixed_imponibileimporto_for_the_previous_row_total_develop
...
fix: ImponibileImporto not getting calculated properly
2019-10-09 18:16:26 +05:30
Pranav Nachanekar
aa918e8528
moved validations to sepeate functions
2019-10-09 15:49:48 +05:30
Marica
ccad0a4cf9
feat: Stock Quick Balance ( #19123 )
...
* feat: Stock Quick Balance
It will display the stock balance and stock value given the date and warehouse
Item code can be fed or barcode can be scanned to retrieve the values
* fix: Codacy fixes
* fix: Renamed to Quick Stock Balance and minor fixes
Refactored code , combined functions to make it DRY
Added permissions for Stock User and Manager
Added more context to naming
2019-10-09 15:24:58 +05:30
Pranav Nachanekar
2c99594688
remove: styles for non existant radio
2019-10-09 15:22:57 +05:30
Pranav Nachanekar
9ccc43980b
Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop
2019-10-09 14:17:37 +05:30
Pranav Nachnekar
50e66d81de
fix: use get_single_value
...
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-10-09 08:43:18 +00:00
Pranav Nachanekar
604febb398
fix: set_verified method contained js
2019-10-09 14:09:47 +05:30
Pranav Nachanekar
e434e8e2e2
fix: formatting
2019-10-09 14:08:01 +05:30
Pranav Nachnekar
96930e25f3
fix: readability
...
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-10-09 08:31:37 +00:00
Pranav Nachnekar
5e4ec85574
remove:unnecessary translation
...
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-10-09 08:23:54 +00:00
Rohit Waghchaure
c10064ae2c
fix: ImponibileImporto not getting calculated properly
2019-10-09 13:50:16 +05:30
Faris Ansari
38ac7f7350
Enhancements to Supplier Portal ( #19221 )
...
* fix: Add Purchase Order to portal
* fix: Create Customer or Supplier on first login
Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.
* fix: Styling for transaction_row
* fix: Styling for RFQ page
* fix: Add Purchase Invoice route
- Make Purchase Invoice from PO
* fix: minor
- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Deepesh Garg
a00c98bea7
Merge pull request #19260 from Anurag810/Trends-Fixes
...
fix: Query Condition On Billing date filters in Purchase invoice trends Report.
2019-10-07 17:40:24 +05:30
Mangesh-Khairnar
d5e9cd72df
Merge branch 'develop' into lwp_half_day_fix
2019-10-07 16:08:30 +05:30
Mangesh-Khairnar
75397b441f
style(salary-slip): fixed formatting
2019-10-07 16:08:15 +05:30
Anurag Mishra
fe5890b828
fix: Query Condition On Billing date filters
2019-10-07 14:27:07 +05:30
Pranav Nachnekar
1f1b7eb7d5
Merge branch 'develop' into develop
2019-10-07 06:12:45 +00:00
Deepesh Garg
817443c5dd
Merge pull request #19253 from Thunderbottom/e-invoice-disc-fix
...
chore: check if discount_percentage exists
2019-10-06 23:47:52 +05:30
rohitwaghchaure
16b8e7c432
Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12
...
fix: not able to submit the work order
2019-10-05 23:29:44 +05:30
Chinmay D. Pai
01aca675ef
chore: check if discount_percentage exists
...
fixes TypeError: '>' not supported between instances of 'NoneType' and 'float'
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-05 10:18:21 +05:30
Rohit Waghchaure
484e1fb218
fix: not able to submit the work order
2019-10-04 17:58:21 +05:30
Pranav Nachanekar
e18388ade3
fix:add exception for no opportunity
2019-10-04 16:32:32 +05:30
sahil28297
2caf32d421
fix(patch): Reload Leave Type ( #19240 )
2019-10-04 16:24:53 +05:30
Saqib
d5067b4d73
chore: label changes in retail and stock ( #19243 )
2019-10-04 16:24:26 +05:30
Deepesh Garg
41a6548acb
fix: Label and dependes on fixes in Bank Account ( #19245 )
2019-10-04 16:22:00 +05:30
Pranav Nachanekar
911e034d1c
fix: syntax error
2019-10-04 15:50:02 +05:30
Pranav Nachanekar
0082b78075
fix:incosistent tabs and spaces
2019-10-04 15:36:36 +05:30
Pranav Nachanekar
bfe18d6085
feat:assign appointments from opportunity
2019-10-04 14:41:54 +05:30
Shivam Mishra
ba2faecdc7
fix: null check for valuation rate ( #19195 )
...
* fix: null check for valuatiomn rate
* fix: add rate for item in test records
* refactor: use flt instead of throwing error
* Revert "fix: add rate for item in test records"
This reverts commit f8cebe65f5fe32382aba842f765d263511cbb082.
2019-10-04 11:58:04 +05:30
Pranav Nachanekar
c1bc0f9dfb
fix: added sections for settings
2019-10-04 11:36:53 +05:30
Pranav Nachanekar
25148d0de5
fix:readability
2019-10-04 11:32:39 +05:30
Pranav Nachanekar
9e36a9ee04
fix: move enable check to serverside
2019-10-04 11:28:29 +05:30
Pranav Nachanekar
faf39ecef4
fix:removed print statements
2019-10-04 11:12:50 +05:30
Pranav Nachanekar
22189ec9e8
remove unnecessary doctype 'Timezone'
2019-10-04 11:07:04 +05:30
Deepesh Garg
8b741cfefb
Merge pull request #19228 from Mangesh-Khairnar/fix-stock-ageing-report
...
fix(stock-ageing): filter none values from the fifo queue
2019-10-04 09:00:13 +05:30
Deepesh Garg
894604201b
Merge pull request #19242 from thefalconx33/git-issues
...
fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’
2019-10-03 22:39:04 +05:30
Mangesh-Khairnar
9351313186
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report
2019-10-03 19:21:17 +05:30
Mangesh-Khairnar
ea70c6f696
fix: dynamically filter fifo queue
2019-10-03 19:19:42 +05:30
Pranav Nachanekar
a1d39cab21
fix: travis
2019-10-03 18:26:02 +05:30
Pranav Nachanekar
d40c020e0e
fix:variable names
2019-10-03 17:43:31 +05:30
Pranav Nachanekar
bec88bc52a
fix: exists return tuple not string
2019-10-03 16:58:38 +05:30
Pranav Nachanekar
afe52e8e09
feat: add check for toggling the route
2019-10-03 16:35:08 +05:30
Pranav Nachanekar
72aac09d62
fix:remove tearDown from test
2019-10-03 16:09:50 +05:30
Pranav Nachanekar
43331564b4
fix:class variable in tests
2019-10-03 15:29:09 +05:30
Pranav Nachanekar
42cf5f279f
fix:added class variables to test
2019-10-03 14:26:21 +05:30
Pranav Nachanekar
8640a01f85
remove duplicate day validation
2019-10-03 13:32:57 +05:30
Pranav Nachanekar
1dccc039b7
fix:add tear down to tests
2019-10-03 13:32:46 +05:30
Pranav Nachanekar
59c543570a
feat: made timeslots into flex
2019-10-03 13:18:13 +05:30
thefalconx33
4723da0251
fix : #19239
2019-10-03 13:06:43 +05:30
Pranav Nachanekar
76cbb9132f
fix: more test errors
2019-10-03 12:50:55 +05:30
Pranav Nachanekar
4856645b6d
fix:styling for time-slot
2019-10-03 12:45:42 +05:30
Pranav Nachanekar
c5420bb453
fix: remove validation for repeated days
2019-10-03 12:06:43 +05:30
Pranav Nachanekar
93670fedda
timezone manipulation using pytz
2019-10-03 11:58:02 +05:30
Pranav Nachanekar
1dcedb5054
fix: empty leads and appointment in test
2019-10-03 11:56:54 +05:30
Pranav Nachanekar
c6da5fb38e
fix:guess timezone using moment
2019-10-03 11:56:23 +05:30
rohitwaghchaure
f4245a2d9c
minor: show BOM related operations ( #19237 )
2019-10-03 11:41:36 +05:30
gavin
be8f6f0d65
fix: report ~ lead conversion time ( #19232 )
2019-10-03 11:36:04 +05:30
Frappe PR Bot
045ca33692
feat: Updated translation ( #19227 )
2019-10-03 11:15:41 +05:30
Himanshu
c18b54fc08
Merge branch 'develop' into global_search_modules
2019-10-02 16:39:38 +05:30
Sahil Khan
c5a6e9da15
Merge branch 'develop' into version-12
2019-10-02 16:36:54 +05:30
Sahil Khan
80ed98c87a
bumped to version 12.1.6
2019-10-02 16:56:54 +05:50
Himanshu
2985cffc52
Merge branch 'develop' into global_search_modules
2019-10-02 16:36:19 +05:30
Himanshu Warekar
2935751f75
Merge branch 'global_search_modules' of https://github.com/hrwx/erpnext into global_search_modules
2019-10-02 16:34:19 +05:30
Himanshu Warekar
23c916c0d6
fix: global search dict in hooks
2019-10-02 16:32:53 +05:30
Saurabh
039679cad1
Merge branch 'develop' into shopify
2019-09-30 19:08:44 +05:30
Chinmay Pai
5dfc74c851
fix(amazon-mws): python3 compatibility changes ( #19210 )
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-30 16:59:58 +05:30
Chinmay Pai
9d26c69c4a
fix(amazon-mws): python3 compatibility changes ( #19209 )
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-30 16:59:42 +05:30
DeeMysterio
20194c4cc5
rename return/invoice to Purchase return/invoice ( #19212 )
2019-09-30 16:59:15 +05:30
Rohan
d463c346fe
fix: set no-copy on some contract fields ( #19208 )
2019-09-30 16:37:29 +05:30
Nabin Hait
25e043766a
fix: Get leave approvers in Employee leave balance report ( #19211 )
2019-09-30 16:36:23 +05:30
Mangesh-Khairnar
905573700b
feat(report): fixed asset register ( #19164 )
...
* feat(report): fixed asset register
* fix: fetch supplier and check for asset status
* fix: fetch vendor name from purchase invoice
* style(fixed-asset-register): use conventional column name
* Update fixed_asset_register.py
2019-09-30 16:10:46 +05:30
Himanshu
37f4316df0
Update setup_wizard.py
2019-09-30 16:02:24 +05:30
Marica
de15cc1387
fix: Work order dialog box 'Select Quantity' on clicking 'Finish' ( #19136 )
...
The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order
2019-09-30 15:36:33 +05:30
Pranav Nachanekar
2ea9b3e6f2
fix:test appointments
2019-09-30 15:35:38 +05:30
rohitwaghchaure
8d889ef80e
fix: update the pending qty in production plan on completion of work order ( #19180 )
2019-09-30 15:22:12 +05:30
Deepesh Garg
b54f0fb388
fix: Party column empty in accounts receivable/ payable summary ( #19205 )
2019-09-30 15:19:56 +05:30
Suraj Shetty
1da81d8755
Merge pull request #19206 from hrwX/disp_mobile_no
...
fix: Show primary mobile no
2019-09-30 15:18:01 +05:30
Suraj Shetty
b093ea1f0a
feat: Remove Leaderboard from ERPNext ( #19156 )
...
feat: remove Leaderboard from ERPNext
2019-09-30 15:17:26 +05:30
rohitwaghchaure
ed1cc18ab5
fix: stock ledger report not showing data if the UOM filter has selected ( #19179 )
2019-09-30 15:15:52 +05:30
Marica
147af15268
fix: Added 'Manual' % Complete Method in Project ( #19175 )
...
Added additional '% Complete Method' in Project so that Project can be set to 'Completed' irrespective of presence of Tasks
2019-09-30 15:11:15 +05:30
prssanna
1f512b36c5
fix(patch): set app_type as private
2019-09-30 14:57:21 +05:30
hrwx
ebc0e1ca8a
fix: remove return statement
2019-09-30 14:56:39 +05:30
hrwx
bf09fbe6b9
fix: sku
2019-09-30 14:56:39 +05:30
hrwx
5c036d9aaf
fix: permissions
2019-09-30 14:56:39 +05:30
hrwx
5aa8743024
changes
2019-09-30 14:56:39 +05:30
prssanna
c6b7695ab5
fix: default private app type
2019-09-30 14:56:39 +05:30
prssanna
c8ad8bb7aa
fix: default private app type
2019-09-30 14:56:39 +05:30
prssanna
09f4e0b19c
fix: default private app type
2019-09-30 14:56:39 +05:30
prssanna
a9aac02b90
fix: default private app type
2019-09-30 14:56:39 +05:30
prssanna
e64bdcd12b
fix: default private app type
2019-09-30 14:56:39 +05:30
prssanna
f380b215b2
fix: shopify integration
2019-09-30 14:56:39 +05:30
Himanshu
201bcaf2ca
fix(Company): Do not set default account if left blank ( #19131 )
...
* chore: use dict to set_default_account
* fix: dont override expense account if left empty
* fix: set accounts only if new company
* chore: fix alignment
* fix: test cases
2019-09-30 14:56:08 +05:30
Himanshu
7d6f52f4ab
fix: add system user perm in patient ( #19133 )
2019-09-30 14:40:56 +05:30
Mangesh-Khairnar
d8763d7d65
fix: allow rename/merge in opportunity ( #19202 )
2019-09-30 14:39:46 +05:30
Himanshu Warekar
46831c4c20
fix: show mobile no
2019-09-30 14:34:56 +05:30
Pranav Nachanekar
7f4bc64d22
fix:appointment tests exist check
2019-09-30 13:58:42 +05:30
Himanshu
32b587b3a0
Merge branch 'develop' into global_search_modules
2019-09-30 13:44:42 +05:30
Himanshu Warekar
21abc3aa50
fix: add doctypes for modules
2019-09-30 13:40:02 +05:30
Suraj Shetty
4c3f0b94a4
Merge branch 'develop' into leaderboard
2019-09-30 13:11:19 +05:30
Suraj Shetty
fcb6edf571
Merge branch 'leaderboard' of github.com:prssanna/erpnext into leaderboard
2019-09-30 13:09:53 +05:30
Suraj Shetty
d23c9987ed
style: Fix Codacy
2019-09-30 13:09:12 +05:30
Rohan
60b852bb12
Merge branch 'develop' into dev-work-order-bugs
2019-09-30 13:08:12 +05:30
Rohan
c86cdd609e
Merge branch 'develop' into dev-serial-no-statuses
2019-09-30 13:08:10 +05:30
Deepesh Garg
91aa671a23
Merge pull request #19137 from marination/invoice-discounting
...
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
2019-09-30 12:43:09 +05:30
Suraj Shetty
6bd4509923
Merge branch 'develop' into leaderboard
2019-09-30 12:35:39 +05:30
Rucha Mahabal
34326470b8
fix: produced_qty field hidden and not updated in sales order item ( #19037 )
...
* fix: produced_qty field hidden and not updated in sales order item
* fix: added patch for old sales orders
* fix: produced_qty for sales order item linked to multiple work orders
* fix: comment
* fix: function for updating produced_qty in SO Item
* fix: remove frappe.db.commit
2019-09-30 12:15:39 +05:30
Suraj Shetty
38794c0ca1
Merge branch 'develop' into leaderboard
2019-09-30 11:54:28 +05:30
prssanna
b874922404
fix: whitelist leaderboard functions
2019-09-30 11:12:10 +05:30
Deepesh Garg
296bf9ef42
chore: Add standard chart of accounts template for El Salvador ( #19151 )
...
* chore: Add standard chart of accounts template for El Salvador
* fix: Renane template file
2019-09-30 11:02:49 +05:30
Deepesh Garg
7b1b3f0fa8
fix: Allow alternative item in stock entry while transfering material to subcontractor ( #19189 )
2019-09-30 11:01:05 +05:30
Rucha Mahabal
3564ac7c88
fix: don't create debit/credit note automatically ( #19185 )
2019-09-30 10:59:28 +05:30
DeeMysterio
5ef26b42a8
feat(delivery note): make the delivery trip plus button fetch data from delivery note ( #19046 )
2019-09-30 10:57:32 +05:30
Roland
6edce82aef
do not require address in webshop ( #19096 )
...
fix : #17559 - in webshop adding address should not be mandatory e.g. for online service goods, button to add address remains available
2019-09-30 10:56:22 +05:30
Rohan
e19e16fbf1
fix: remove internal fields from print ( #19101 )
2019-09-30 10:54:01 +05:30
Nabin Hait
2a10b02c68
Merge branch 'develop' into invoice-discounting
2019-09-30 10:10:50 +05:30
Himanshu
25ab1e41df
fix(Contact): mobile_no re-introduced and travis fixes ( #19009 )
...
* fix: mobile_no re-introduced
* fix: test cases
* fix: set email as primary
* fix: add primary email and phone
* fix: utils for contact creation
* chore: remove = from dict
2019-09-30 10:08:15 +05:30
Mangesh-Khairnar
77f22635f2
fix(stock-ageing): filter none values from the fifo queue
2019-09-27 17:50:52 +05:30
prssanna
119c976ad1
fix: missing comma
2019-09-27 16:28:08 +05:30
prssanna
8f7ed71e9e
fix: add df to leaderboard config
2019-09-27 15:09:40 +05:30
Himanshu
83b0b2adec
feat(Global Search): Add fixtures for global search ( #19049 )
2019-09-27 00:59:48 +05:30
Mangesh-Khairnar
a01ebe0a54
Merge branch 'develop' into rename-job-applicant
2019-09-26 18:41:28 +05:30
Nabin Hait
001edb4464
refactor: Reposting utility of Stock ledger ( #19155 )
2019-09-26 16:44:35 +05:30
sahil28297
a9ff4f6688
fix(Report): Sales Register
2019-09-26 13:58:00 +05:30
prssanna
d095acdad5
fix: use orm for queries
2019-09-26 13:41:24 +05:30
Shivam Mishra
8781dc8ca3
fix: footer link redirect to landing pages ( #19181 )
2019-09-26 12:53:52 +05:30
Mangesh-Khairnar
f82ea857a0
feat(job-applicant): allow rename/merge with existing
2019-09-26 12:29:41 +05:30
Marica
54becbb33a
fix: Codacy fix(whitespaces)
2019-09-26 11:24:34 +05:30
marination
a877115ff4
fix: Minor changes
...
Added value in fetch from and removed client side code
2019-09-26 11:08:39 +05:30
marination
e7f67592a8
fix: Made outstanding amount field read only and added validation
...
Made the field editable so that outstanding amount can be adjusted
2019-09-26 10:58:02 +05:30
marination
ed004018d6
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
...
It wrongly fetched grand total from sales invoice instead of outstanding amount.
2019-09-26 10:58:02 +05:30
Deepesh Garg
d138633c5b
Merge pull request #19163 from thefalconx33/small-fixes
...
fix: Supplier field not getting populated in serial no on creation of asset
2019-09-25 22:09:41 +05:30
Marica
23d7b09389
fix: Item Rate within Update Items in Sales order ( #19172 )
...
Blocked negative discount percentage, which affected the item rate every time Update Items action was taken
2019-09-25 17:17:36 +05:30
Rucha Mahabal
132323462c
fix(Report): Sales Register ( #19166 )
2019-09-25 16:03:45 +05:30
Pranav Nachanekar
fd46bf2616
fix codacy
2019-09-25 16:01:48 +05:30
Pranav Nachanekar
774167192a
Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop
2019-09-25 13:12:32 +05:30
Pranav Nachanekar
291e161793
Added permissions for sales user
2019-09-25 13:11:04 +05:30
Nabin Hait
2064dfc5a9
fix: Handling payments against credit/debit notes and party currency ( #19154 )
2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451
enhancement(tds-monthly-payable): remove zero value transaction ( #19141 )
2019-09-24 19:46:06 +05:30
Rucha Mahabal
c6b548b5b2
fix(Stock): item variant description ( #19134 )
2019-09-24 19:17:13 +05:30
gavin
fed5788c50
fix: patch fix ( #19147 )
2019-09-24 19:15:29 +05:30
Rucha Mahabal
824376a045
fix(Journal Entry): Opening Entry not fetching accounts ( #19148 )
2019-09-24 19:13:55 +05:30
Saqib
451d1a1744
fix: Bypass credit limit and Project Template field not visible( #19162 )
...
* Fix: Allow Project Template in Quick Entry
* Fix: Label Changes
2019-09-24 19:10:59 +05:30
thefalconx33
c15cc8fc28
fix : #18624
2019-09-24 18:49:16 +05:30
Sahil Khan
946f68f7f0
bumped to version 12.1.5
2019-09-24 18:36:53 +05:50
Vijaya Raghavan
e9affd97ac
LWP for half day in multi day leave
2019-09-24 17:04:32 +05:30
Pranav Nachanekar
9f86022c2b
fix: Error in test setUp
2019-09-24 16:07:41 +05:30
Pranav Nachanekar
d45c12b382
Formatting
2019-09-24 16:07:02 +05:30
prssanna
3f1444e410
fix: get leaderboards using hooks
2019-09-24 13:51:22 +05:30
prssanna
3bd15d3aaa
feat: remove leaderboard from erpnext
2019-09-24 13:06:31 +05:30
Pranav Nachanekar
c9cf5aebea
Changed required values, add clientside validation
2019-09-24 12:08:37 +05:30
Rohan
a51a304cf0
Merge branch 'develop' into dev-work-order-bugs
2019-09-24 11:53:00 +05:30
Nabin Hait
7ab861fe95
Merge branch 'develop' into develop
2019-09-24 11:50:38 +05:30
Nabin Hait
786d7bd3d4
Merge branch 'develop' into dev-serial-no-statuses
2019-09-24 11:50:33 +05:30
Deepesh Garg
d9e9d562f8
fix: Travis (develop) ( #19140 )
...
* fix: Travis
* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Pranav Nachanekar
558d44e519
Removed auto-assignment for unverified appointments
2019-09-24 11:33:57 +05:30
Deepesh Garg
2e7419d78f
fix: Do not validate warehouse in case of Repack ( #19050 )
2019-09-24 10:05:42 +05:30
Himanshu
fdad33309b
fix: get correct warehouse for product bundle ( #19130 )
2019-09-24 10:03:34 +05:30
Anurag Mishra
5a61880e6a
fix: provided delete permission ( #19143 )
2019-09-24 09:54:54 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Pranav Nachanekar
8393ebbbca
Fixed missing permission in update
2019-09-23 17:14:31 +05:30
Pranav Nachanekar
8b744b2d03
Added request verification and url encoding
2019-09-23 15:55:35 +05:30
rohitwaghchaure
8dd4699f10
feat: Allow to make landed cost voucher against the asset item ( #19121 )
2019-09-23 15:03:52 +05:30
rohitwaghchaure
e18f7b91c3
Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop
...
fix: removed mandatory property for address field in quick entry
2019-09-23 14:48:27 +05:30
Pranav Nachanekar
a35e34b5f0
FIxed typos and create_lead method
2019-09-23 14:38:22 +05:30
Pranav Nachanekar
3eccb84eaa
Fixed update method
2019-09-23 14:25:42 +05:30
Pranav Nachanekar
b6b27d9256
Corrected moving to doctype for email
2019-09-23 14:16:13 +05:30
Pranav Nachanekar
7b7962d28c
Added test cases
2019-09-23 13:05:18 +05:30
Pranav Nachanekar
dcfc849946
Moved email to appoitnmetn doctype
2019-09-23 11:52:26 +05:30
Pranav Nachanekar
f8cc86bfed
Moved email from class variable to doctype
...
Formatting
Made methods which link other doctypes idempotent
2019-09-23 11:28:05 +05:30
Pranav Nachanekar
0800031c0d
Addee email to appointment doctyoe
...
and asthetic changes
2019-09-23 11:26:46 +05:30
Pranav Nachanekar
6b0fea16b6
Added buttons to linked docs
2019-09-23 11:26:18 +05:30
Anurag Mishra
2c60f6419e
feat: missmatching amount in GST Sales report and itemised sales report ( #19116 )
2019-09-20 23:00:09 +05:30
Suraj Shetty
462d9cb331
feat: "Purchase Order items to be Received or Billed" report ( #19091 )
...
* feat: Init "Purchase Order items to be received or billed" report
* fix: Rename report
* fix: Column name
2019-09-20 18:30:22 +05:30
Mangesh-Khairnar
a44e8afe71
feat: add bank account in payroll entry ( #19021 )
...
* fix(journal-entry): change fieldname from bank account no to bank account
* fix: add payroll entry in bank dashboard
* fix: fetch account from bank account
* fix: minor changes
* patch: check for bank account no column before updating
* fix: use rename field function
2019-09-20 18:19:47 +05:30
Sahil Khan
0c665e5638
bumped to version 12.1.4
2019-09-20 15:37:21 +05:50
Rohit Waghchaure
1f9a84f165
fix: removed mandatory property for address field in quick entry
2019-09-20 12:18:23 +05:30
Pranav Nachanekar
9c0f462336
Fixed Syntax errors
2019-09-20 10:51:56 +05:30
Pranav Nachanekar
aa7d0c0163
Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop
2019-09-20 10:47:18 +05:30
Pranav Nachanekar
73420e462f
Added email
2019-09-20 10:44:52 +05:30
Pranav Nachanekar
fa4a2a53e8
Added email
2019-09-20 10:41:59 +05:30
Pranav Nachanekar
df1a5a9633
Added flow for verifying emails
2019-09-20 10:08:48 +05:30
Pranav Nachanekar
5324234bd0
Removed required lead
2019-09-20 10:08:26 +05:30
rohitwaghchaure
30f3354a7a
Merge pull request #19114 from marination/report-fix
...
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 19:01:05 +05:30
Anurag Mishra
c16fb9eb9d
fix: dashboard button not working ( #19094 )
2019-09-19 18:12:39 +05:30
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue
...
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
2019-09-19 18:01:03 +05:30
marination
8590112faa
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 17:48:23 +05:30
Rohit Waghchaure
6daab3ca89
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given)
2019-09-19 17:01:49 +05:30
Rucha Mahabal
51eabfe352
fix: subcontracting material transfer dialog in Purchase Order ( #19111 )
...
* fix: subcontracting material transfer dialog in Purchase Order
* fix: dialog title
2019-09-19 16:57:03 +05:30
Mangesh-Khairnar
68a4c70b72
Merge branch 'develop' into attendance_template_fix
2019-09-19 13:34:39 +05:30
Pranav Nachanekar
ca2509423a
Added permissions for HR manager
2019-09-19 12:36:51 +05:30
Pranav Nachanekar
4109f88c04
Linked send_reminder in calendar event
...
to Appointment Booking Settings
2019-09-19 12:08:10 +05:30
Pranav Nachanekar
5bf52ebed6
limit assigment load to appointment day
2019-09-19 11:47:54 +05:30
Pranav Nachanekar
ba99945359
Prevent booking of appointments for past times
2019-09-19 11:21:05 +05:30
Suraj Shetty
28d182af15
fix: Permission issue in Total Stock Summary report ( #19110 )
...
Data in "Total Stock Summary" report were not getting filtered
based on applied user permissions because some link fields had
wrong options
2019-09-19 11:13:22 +05:30
Rohan
8a097c8627
fix: only set times if job card is filled ( #19107 )
2019-09-18 20:05:49 +05:30
Rucha Mahabal
1ba83427e5
fix: asset maintenance TypeError during date comparisons ( #19098 )
2019-09-18 20:04:15 +05:30
Marica
d793e39b6d
fix: Customer Credit Balance Report query fix ( #19104 )
2019-09-18 19:59:31 +05:30
Pranav Nachanekar
ec1dae023c
styling
2019-09-18 16:13:29 +05:30
Pranav Nachanekar
7d476a3e35
Moved lead assignment to the controller
2019-09-18 15:33:31 +05:30
Pranav Nachanekar
81449ece54
fix:Linking lead
2019-09-18 14:33:40 +05:30
Pranav Nachanekar
7323bfdad7
Styling and bug fixes
2019-09-18 14:33:10 +05:30
Rohan
b9c1dad2e6
Merge branch 'develop' into dev-serial-no-statuses
2019-09-18 13:24:28 +05:30
Rucha Mahabal
aeaf416d6d
fix: upload attendance template not marking attendance
2019-09-18 13:11:30 +05:30
Pranav Nachanekar
3c8bea65ef
Merged with local
2019-09-18 10:39:11 +05:30
Pranav Nachnekar
57c311f8e9
Merge branch 'develop' into develop
2019-09-18 10:33:39 +05:30
rohitwaghchaure
780fb8a4e5
fix: set stock adjustment account for the raw materials instead of COGS ( #19090 )
2019-09-17 18:46:49 +05:30
rohitwaghchaure
d019d28bc9
fix: Customer Ledger Summary report not working on python 3 ( #19092 )
2019-09-17 18:45:59 +05:30
Sahil Khan
4f96ec1b6c
bumped to version 12.1.3
2019-09-17 17:31:14 +05:50
sahil28297
c1930fa64d
Merge branch 'develop' into fix_indentation
2019-09-17 17:08:16 +05:30
Pranav Nachanekar
91a564989f
Styling and PR review changes
2019-09-17 16:58:41 +05:30
kaviya
9e4f674fb9
fix: indentation error in stock ageing
...
fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720
2019-09-17 16:02:11 +05:30
Suraj Shetty
627a3dcd6d
feat: Default energy point rules ( #19003 )
...
* feat: Add default energy point rules during install
* fix: Add completed_by field to task doctype
* fix: Rule data
* fix: Add default rules for opportunity
* fix: Add a patch to create default energy point rules
* fix: Default success action message
* fix: Use .items() instead of .iteritems()
* fix: Add "create_default_energy_points" patch entry
* fix: Reload Energy Point Rule to fix patch
* fix: Import frappe
2019-09-17 15:54:41 +05:30
Suraj Shetty
af2eac4334
fix: Create error log if something goes wrong while call log creation ( #19055 )
...
* fix: Create error log if something goes wrong while call log creation
- For better debbugging
* fix: Rollback if any error occurs during call log creation
2019-09-17 15:53:23 +05:30
Pranav Nachnekar
33daf281bd
Merge branch 'develop' into develop
2019-09-17 14:14:16 +05:30
Suraj Shetty
7563bdf6f8
Merge branch 'develop' into fix-exotel-call-log
2019-09-17 13:28:59 +05:30
rohitwaghchaure
ad5fc07652
Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11
...
fix: plc conversion issue for offline pos
2019-09-17 13:24:41 +05:30
Suraj Shetty
6b9b92afb0
fix: Return employee emails instead of employee
2019-09-17 13:22:40 +05:30
Rohit Waghchaure
094612dc02
fix: plc conversion issue for offline pos
2019-09-17 13:04:28 +05:30
Faris Ansari
4fe67236ed
fix: Python 3 fixes for MWS Connector ( #18986 )
2019-09-17 12:57:51 +05:30
Deepesh Garg
c5c3860c5c
fix: Mandatory accounting dimensions while creating asset depreciation entry ( #19073 )
...
* fix: Mandatory accounting dimensions while creating asset depreciation entry
* fix: Consider account types while assigning accounting dimensions
2019-09-17 12:50:28 +05:30
rohitwaghchaure
6de526ff42
fix: not able to change the account type in parent company account head ( #19083 )
2019-09-17 12:49:52 +05:30
Mangesh-Khairnar
5d41e3848d
fix: do not submit depreciation journal entry when workflow is enabled ( #19000 )
2019-09-17 12:45:14 +05:30
Pranav Nachnekar
a8752db012
Typo and styling fixes
...
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-09-16 20:02:20 +05:30
Frappe PR Bot
abd434f656
feat: Updated translation ( #19077 )
2019-09-16 19:57:27 +05:30
Suraj Shetty
bc001d2d9a
feat: Add stock ageing data to stock balance report ( #19036 )
...
* feat: Add stock ageing data to stock balance report
* fix: Use fifo queue warehouse wise
* fix: "Stock Ledger Entry" get query
* fix: Remove unwanted quotes in item details query
* fix: Check if no SLE was passed
* fix: Codacy
* fix: Add logic to include additional UOM columns
* fix: Show stock ageing data optionally
2019-09-16 19:57:04 +05:30
Nabin Hait
b50b5095ad
fix: Added field disabled instead of enabled in cost center ( #19065 )
2019-09-16 19:44:37 +05:30
Marica
bac4b93639
fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master ( #19066 )
...
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
2019-09-16 19:44:28 +05:30
rohitwaghchaure
76df782006
fix: Decimal point issue for e-invoice ( #19068 )
2019-09-16 19:43:17 +05:30
Mangesh-Khairnar
dce04b7335
fix: filter for payment order ( #19070 )
2019-09-16 19:40:27 +05:30
Chinmay Pai
7e8e4783a1
fix: remove function call from kwarg ( #19072 )
...
this commit fixes mail not being sent for leave applications
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-16 19:14:42 +05:30
Rohit Waghchaure
40c5bf9e94
fix: naming series added in the asset movement
2019-09-16 16:42:42 +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
Deepesh Garg
8cc2f83bd5
fix: Fetch scrap items from BOM if purpose is repack ( #19056 )
2019-09-16 14:49:12 +05:30
Nabin Hait
57835f0a37
fix: Company is required to get bin details ( #19058 )
2019-09-16 14:48:16 +05:30
Rushabh Mehta
72dcb51177
fix(minor): opportunity_from may not be selected ( #19063 )
2019-09-16 14:47:43 +05:30
Sammish Thundiyil
a2a9b39794
modified: erpnext/accounts/doctype/account/account.json ( #19032 )
2019-09-16 13:29:25 +05:30
Nabin Hait
c2a9b14c96
fix: Invalid reference doctypes for accounting dimensions ( #19027 )
...
* fix: Invalid reference doctypes for accounting dimensions
* fix: Add server side validation for accounting doctypes
* fix: set fieldname and label before insert
2019-09-16 13:26:37 +05:30
Nabin Hait
4432a874de
Merge branch 'develop' into dev-work-order-bugs
2019-09-16 13:10:47 +05:30
Nabin Hait
74fdfff5b5
fix: Set todo status as Closed if task completed ( #19059 )
2019-09-16 13:06:37 +05:30
rohitwaghchaure
87000977d5
Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop
...
fix: user can able to change rate and discount even if they don't have permissions
2019-09-16 11:50:52 +05:30
Rohit Waghchaure
a9435cc6b0
fix: user can able to change rate and discount even if they don't have permission
2019-09-16 11:15:22 +05:30
barredterra
5bd8562b5a
Merge branch 'develop' into datev_report_headers
2019-09-14 20:09:39 +02:00
rohitwaghchaure
4a323463f7
fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices ( #19039 )
2019-09-13 18:36:57 +05:30
