Deepesh Garg
e0b4d33039
Merge pull request #18715 from Alchez/v12-lead-address-contact
...
feat: create address and contact after lead creation (develop)
2019-12-24 16:46:05 +05:30
deepeshgarg007
d7427919a4
fix: Address section rearrange and minor bug fixes
2019-12-24 16:45:09 +05:30
Saqib
0ad7449ae3
feat: allow adding & deleting of items in submitted SO & PO ( #19911 )
...
* feat: allow adding of items after quotation submission
* feat: allow deletion of items from submitted SO & PO
* fix: case when items are added and deleted at once
* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-24 16:42:30 +05:30
Don-Leopardo
5557b16260
fix: order_type validation restriction ( #18096 )
2019-12-24 16:39:34 +05:30
rohitwaghchaure
5c0ea2d7c9
Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger
...
feat: drill down on batch transactions (develop)
2019-12-24 15:25:05 +05:30
Deepesh Garg
e633567787
Merge branch 'develop' into v12-lead-address-contact
2019-12-24 14:43:41 +05:30
Deepesh Garg
a02bb5170b
Merge pull request #19913 from nextchamp-saqib/cart-address-fix
...
fix: enable adding of address without enabling checkout feature
2019-12-24 14:08:19 +05:30
rohitwaghchaure
08433c2919
fix: supplier email id field not showing in the notification for purchase cycle doctypes ( #20071 )
2019-12-24 13:03:47 +05:30
Deepesh Garg
58408217f6
Merge pull request #19822 from Mangesh-Khairnar/edit-item-details
...
feat(marketplace): edit item details
2019-12-24 13:02:20 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension
...
feat: Dynamic filters for dimensions in budget variance report
2019-12-24 12:57:50 +05:30
Deepesh Garg
55bc26e300
fix: Allow creation of multiple landed cost voucher against a Purchase Document ( #20058 )
2019-12-24 12:55:01 +05:30
Himanshu
5af4c57ef7
fix: ambihious error ( #20068 )
2019-12-24 12:31:38 +05:30
Sun Howwrongbum
088be37e64
feat: consider expiry_date during Batch queries ( #20065 )
2019-12-24 12:29:25 +05:30
RJPvT
818c49279c
Update supplier_scorecard.py ( #20061 )
2019-12-24 12:24:58 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount
2019-12-24 11:51:39 +05:30
Rohan
ff98a52834
Merge branch 'develop' into v12-lead-address-contact
2019-12-24 11:21:08 +05:30
DeeMysterio
152c6be209
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant ( #20053 )
2019-12-23 19:02:29 +05:30
Wolfram Schmidt
964cbc03ba
Update employee.json ( #20057 )
...
unnecessary description. Should be added by customer manually if needed individually.
2019-12-23 18:50:40 +05:30
Parth J. Kharwar
da5d5c4941
fix(hr): update leave application status on cancel ( #19883 )
2019-12-23 18:41:17 +05:30
Khushal Trivedi
d8c10bcedb
fix:Sibling child table filtering for duplicate entry on student form ( #19908 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* fix-education: date of birth validation
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
* fix:Sibling child table filtering for duplacacy on student form
2019-12-23 18:38:11 +05:30
Prssanna Desai
4f72c0b8b5
fix: wrong items in table being deleted ( #19994 )
2019-12-23 18:27:12 +05:30
Marica
93cb64ee30
enhancement`: Added Set Reserve Warehouse field in Purchase Order. ( #19991 )
2019-12-23 18:24:56 +05:30
Pranav Nachnekar
8bada8759a
fix: wrap scheduled_time with getdate() ( #20044 )
...
* fix: wrap `scheduled_time` with `getdate()`
Handles inconsistent data returned from the ORM.
* fix: use `getdate()` instead of `date()`
2019-12-23 18:19:29 +05:30
Anurag Mishra
bd5f5dabbd
fix: Salary Structure Fixes ( #19923 )
2019-12-23 18:01:40 +05:30
Deepesh Garg
2b3482d5dd
fix: Do not validate accounting dimensions if from repost ( #20042 )
...
* fix: Do not check for accounting dimensions in case of repost
* fix: Do not validate accounting dimensions if from repost
2019-12-23 17:58:50 +05:30
Saqib
c1b6b4ed35
fix: breadcrumb for company list ( #20051 )
2019-12-23 17:28:00 +05:30
Saqib
9078607600
fix: paid amount gets overwritten by get_outstanding_invoices ( #20050 )
2019-12-23 16:25:16 +05:30
Saqib
06f9538e51
fix: bad condition while checking last asset movement entry ( #20047 )
2019-12-23 16:08:21 +05:30
Saqib
4f18d2548d
fix: none type object updates AR report row ( #19958 )
2019-12-23 16:01:38 +05:30
Saqib
1263515a92
fix: exchange rate not fetching correctly ( #20010 )
2019-12-23 15:51:31 +05:30
Anurag Mishra
e6b3da0f59
feat: fixed party and party type in Accrual journal entry ( #20021 )
2019-12-23 15:50:29 +05:30
Mangesh-Khairnar
6edd3580d1
fix(expense-claim): update status ( #20030 )
...
* fix(expense-claim): update status
* fix(expense-claim): compare using grandtotal precision
2019-12-23 15:48:34 +05:30
Deepesh Garg
06e7cf3caa
Merge pull request #20009 from nextchamp-saqib/pi-payable-filter
...
fix: bad credit to filter in purchase invoice
2019-12-23 14:50:56 +05:30
thefalconx33
ee10f2f50d
fix: bad query for debit_to field in sales invoice
2019-12-23 13:07:00 +05:30
Rucha Mahabal
0e83a5754b
fix: remove illustrations from onboarding slides ( #19872 )
...
* fix: remove illustrations from onboarding slides
* fix: change Welcome slide's description
* fix: justify text in slide
2019-12-23 08:24:46 +05:30
Deepesh Garg
704235565e
Merge pull request #20012 from nextchamp-saqib/share-transfer-perm
...
fix: no role has cancelling permission for share transfer doctype
2019-12-21 17:23:15 +05:30
Rohit Waghchaure
0dba4345f3
fix: patch
2019-12-20 17:04:39 +05:30
rohitwaghchaure
7e7cad8296
Merge pull request #20005 from 0Pranav/appointment-schedulling
...
fix: multiple issues with appointment schedulling
2019-12-20 15:16:59 +05:30
thefalconx33
7e68f050d9
fix: account manager doesn't have cancel submit perm for share transfer
2019-12-20 14:50:25 +05:30
rohitwaghchaure
0dd7e77615
Merge pull request #19928 from 0Pranav/delete-company-txn-query
...
fix: replace sql with orm query for deleting company communications
2019-12-20 13:47:34 +05:30
rohitwaghchaure
977511e814
Merge pull request #20028 from rohitwaghchaure/subcontracting_issue_for_partial_purchase_receipt_develop
...
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:36:23 +05:30
rohitwaghchaure
9c1d3f2f54
Merge pull request #20024 from deepeshgarg007/gstr_2_report_fix
...
fix: Tax amount not visible for some invoices
2019-12-20 13:34:53 +05:30
Rohit Waghchaure
c2a5f99a38
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:01:02 +05:30
Deepesh Garg
7043bbd19e
Merge pull request #19869 from nextchamp-saqib/website-fix
...
fix: website showing disabled items in list of products
2019-12-20 12:14:12 +05:30
Deepesh Garg
ccea0759cc
Merge pull request #20014 from marination/valuation_rate_company
...
fix: Company None not found in get_valuation_rate
2019-12-20 11:55:57 +05:30
deepeshgarg007
ad9eb9b72c
fix: Tax amount not visible for some invoices
2019-12-19 20:57:40 +05:30
Mangesh-Khairnar
c1a1e7d503
style: formatting changes
2019-12-19 20:11:37 +05:30
Deepesh Garg
c408628ef2
Merge pull request #19979 from deepeshgarg007/sales_register_upgrade
...
fix: Update sales register report
2019-12-19 13:53:15 +05:30
marination
457ca0fe6c
fix: Company None not found in get_valuation_rate
2019-12-19 13:34:29 +05:30
thefalconx33
e9cb561d8d
fix: no role has cancelling permission for share transfer doctype
2019-12-19 13:18:46 +05:30
thefalconx33
9d9a78442e
fix: bad filter query
2019-12-19 13:10:57 +05:30
Deepesh Garg
57f9b758b7
Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation
...
fix: use open_mapped_doc instead of create_new_doc
2019-12-19 11:59:50 +05:30
deepeshgarg007
aba58ba50e
fix: Spacing after commas
2019-12-19 11:02:37 +05:30
Rohit Waghchaure
2ae79b8ac2
fix: Pricing Rule Discount for Product
2019-12-18 17:53:21 +05:30
0Pranav
e786eea7db
remove comments
2019-12-18 16:25:26 +05:30
0Pranav
5f5c725ef9
add book appointment to the sidebar
2019-12-18 16:21:50 +05:30
0Pranav
0db86204cf
fix : only set price list if it exists for customer
2019-12-18 16:03:40 +05:30
0Pranav
84ae2cc543
fix: defualt timezone not getting selected
2019-12-18 15:47:10 +05:30
0Pranav
5150c69ee6
use open_mapped_doc instead of create_new_doc
2019-12-18 12:16:49 +05:30
Anurag Mishra
1202e64403
fix: Training Event Email Tenplate ( #19652 )
2019-12-18 11:43:16 +05:30
0Pranav
e7aa20ebef
fix: replace sql query by orm in delete_communications and added tests
2019-12-18 11:16:54 +05:30
Ben Knowles
f597ba82ea
fix: task validation error when adding tasks to projects ( #19919 )
...
* fix: task validation error when adding tasks to projects
When adding a task to a project, if the project didn't have an Expected End Date the validation would fail.
This is because passing a None value to getdate() returns today's date, rather than being optional as expected.
* update task.py
2019-12-18 00:37:02 +05:30
deepeshgarg007
be8c406808
fix: Update sales register report
2019-12-17 22:27:23 +05:30
Rohit Waghchaure
4203eb4ee1
fix: not able to make work order from BOM
2019-12-17 18:19:26 +05:30
deepeshgarg007
b695fd31d6
fix: Remove trailing whitespace and add semicolon
2019-12-17 18:14:33 +05:30
deepeshgarg007
e65ada2807
feat: Dynamic filters for dimensions in budget variance report
2019-12-17 17:54:34 +05:30
rohitwaghchaure
5d0c42e2a1
Merge pull request #19943 from nextchamp-saqib/gl-precision-fix
...
fix: gl entries doesn't filter based on debit precision
2019-12-17 17:23:34 +05:30
rohitwaghchaure
3772b2e03e
Merge pull request #19962 from rohitwaghchaure/allow_overproduction_against_work_order
...
fix: now allow to over production against work order
2019-12-17 17:16:24 +05:30
rohitwaghchaure
86babbe3ac
Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13
...
fix: incorrect outstanding amount showing in the AP/AR report
2019-12-17 17:15:45 +05:30
Rohit Waghchaure
0f583b8c5a
fix: incorrect outstanding amount shwoing in the AP/AR report
2019-12-17 12:48:02 +05:30
deepeshgarg007
83ecaefd4c
feat: Custom button to create return entry from Employee Advance
2019-12-17 11:03:22 +05:30
rohitwaghchaure
741f64a51d
Merge pull request #19960 from rohitwaghchaure/fixed_incorrect_child_bom_fecthed_develop
...
fix: incorrect child boms fetched
2019-12-16 17:00:35 +05:30
Rohit Waghchaure
b5bf22a821
fix: now allow to over production against work order
2019-12-16 16:53:00 +05:30
Rohit Waghchaure
197a99ee35
fix: incorrect children boms fetched
2019-12-16 16:20:47 +05:30
rohitwaghchaure
bb75179577
Merge pull request #19957 from nextchamp-saqib/pos-serial-no-fix
...
fix: display serial no selection on adding items to cart
2019-12-16 15:11:51 +05:30
thefalconx33
f195ccd85f
fix: review changes
2019-12-16 15:04:17 +05:30
thefalconx33
e9c9cbd2fe
fix: display serial no selection on adding items to cart
2019-12-16 14:55:16 +05:30
rohitwaghchaure
b500f2ce4c
Merge pull request #19940 from marination/item_manufacturer_table_dev
...
fix: Removed 'manufacturers' table from Item Master
2019-12-16 14:44:49 +05:30
rohitwaghchaure
86b2956ac0
Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount
...
fix: pricing rule not working for product discount
2019-12-16 14:44:22 +05:30
Rohit Waghchaure
8bd84b28ca
fix: schedule date
2019-12-16 12:29:07 +05:30
marination
5ab823beab
fix: Removed validation from non existent manufacturers table
2019-12-16 12:19:47 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
deepeshgarg007
c05bd1964f
feat: Capture return amount against Employee advance via Journal Entry
2019-12-15 21:22:28 +05:30
deepeshgarg007
b223dd95e2
fix: Dashboard for employee advance doctype
2019-12-15 21:21:31 +05:30
deepeshgarg007
40b7ac4987
fix: Minor filter fix in expense claim type
2019-12-15 21:20:55 +05:30
Deepesh Garg
b0ab31f69b
Merge pull request #19927 from surajshetty3416/fix-profit-and-loss-statement
...
fix: Profit and Lost (financial statement) report
2019-12-15 20:22:31 +05:30
rohitwaghchaure
5ed8465788
Merge pull request #19945 from nextchamp-saqib/existing-asset-fix
...
fix: remove mandatory purchase reference for existing asset
2019-12-15 16:29:30 +05:30
Suraj Shetty
ba3c9b7651
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 23:36:11 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 22:49:53 +05:30
deepeshgarg007
94ff8058ac
fix: Add missing import
2019-12-14 21:25:30 +05:30
rohitwaghchaure
b2f65366cf
Merge pull request #19941 from deepeshgarg007/pricing_rule_fix
...
fix: Price rule filtering fix
2019-12-13 16:01:16 +05:30
thefalconx33
5da7e729a5
fix: remove mandatory purchase reference for existing asset
2019-12-13 15:44:39 +05:30
thefalconx33
bfc43d3b15
fix: gl entries doesn't filter based on debit precision
2019-12-13 15:41:19 +05:30
deepeshgarg007
8c9c6ec919
fix: Price rule filtering fix
2019-12-13 13:47:15 +05:30
marination
81990aee9f
fix: Removed 'manufacturers' table from Item Master
2019-12-13 13:18:59 +05:30
Deepesh Garg
57e6bcaf43
Merge pull request #19733 from marination/zero-division-basic-amount
...
fix: Division by zero error in Stock Entry
2019-12-13 09:23:44 +05:30
marination
0e33f792d3
fix: Distribute charges based on quantity if Total Basic Amount is Zero.
2019-12-12 16:34:41 +05:30
Deepesh Garg
c9870c88b6
Merge pull request #19930 from deepeshgarg007/regional_address_fix
...
fix: Get regional address details
2019-12-12 16:25:31 +05:30
Deepesh Garg
859b464a57
Merge pull request #19904 from prssanna/file-upload-fix
...
fix: Bank statement not getting attached in Bank Reconciliation
2019-12-12 15:19:54 +05:30
