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

21072 Commits

Author SHA1 Message Date
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
Gavin D'souza
1e4ea466d3 style: update/standardize rename_doc usage 2019-12-19 19:07:29 +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
Mangesh-Khairnar
4bea44b9c9 fix: update already existing items 2019-12-13 15:05:43 +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
deepeshgarg007
c58dc873d5 fix: Get regional address details fix 2019-12-12 14:55:57 +05:30
Suraj Shetty
f95267041d fix: Financial statement report 
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
 2019-12-12 13:06:17 +05:30
Rohit Waghchaure
9b0d7b93dd fix: not able to submit the landed cost voucher 2019-12-12 12:10:25 +05:30
Deepesh Garg
60592e9d43
Merge pull request #19897 from hrwX/qms-int-issue 
fix: rename labels
 2019-12-12 08:45:51 +05:30
Deepesh Garg
d10cefa37e
Merge pull request #19893 from marination/rounded_total 
fix: Disable Rounded Total always showing field default value
 2019-12-11 18:40:56 +05:30
Deepesh Garg
0e10340471
Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher 
fix: not able to cancel the landed cost voucher
 2019-12-11 18:38:23 +05:30
thefalconx33
107989316c fix: additional notes from Quotations not saved in SO 2019-12-11 18:15:54 +05:30
thefalconx33
894c210027 fix: enable address without checkout feature 
* fix add address form country link field
 2019-12-11 17:43:04 +05:30
Mangesh-Khairnar
c6599fd1e2 fix: add publihed in hub track item 2019-12-11 17:29:04 +05:30
thefalconx33
5b622eace1 fix: handle scenario with no condition 2019-12-11 16:08:31 +05:30
0Pranav
d3605d2354 fix: issue in javascript timezones 2019-12-11 15:02:23 +05:30
prssanna
2ef26fbb07 fix: empty fname and fcontent of uploaded file 2019-12-11 14:21:04 +05:30
Rohit Waghchaure
37cf096102 fix: not able to cancel the landed cost voucher 2019-12-11 13:50:29 +05:30
Himanshu Warekar
45e4b73e08 fix: rename fields 2019-12-11 13:07:41 +05:30
rohitwaghchaure
797481f9d5
Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement 
fix: Manufacturing UX, added calendar view for job card
 2019-12-11 13:01:16 +05:30
marination
ca6dbad7cb fix: Disable Rounded Total always showing field default value 2019-12-11 12:10:05 +05:30
Raffael Meyer
9e32f587f5 fix: remove contact info, use international format (#19828) 
- for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15
- it is not customary, to use contact information such as phone number in the address
 2019-12-10 21:41:05 +05:30
Khushal Trivedi
5380a4c3db fix-education: date of birth validation on student form (#19875) 
* 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
 2019-12-10 21:38:42 +05:30
Anurag Mishra
9046c13858 fix: added extra condition (#19884) 2019-12-10 21:37:27 +05:30
Pranav Nachnekar
6aa763221b fix: rename appointment booking route (#19886) 
* rename appoinment booking route

* fix: replace all references to book-appointment route
 2019-12-10 21:35:28 +05:30
rohitwaghchaure
c58495dcee fix: Item-wise Sales History report not working (#19889) 2019-12-10 21:34:03 +05:30
Saqib
664d0d89b5 fix: incorrect account mapping for child companies (#19887) 
* fix: incorrect account mapping for child companies on adding account to parent company

* Update account.py
 2019-12-10 21:32:17 +05:30
Mangesh-Khairnar
dd079d7e02
Merge pull request #19885 from Anurag810/leave_application_dashboard_fix 
fix: removed only custom dashboard
 2019-12-10 16:24:51 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469) 
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

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

* fix: Test Cases

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

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

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

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
 2019-12-10 15:55:05 +05:30
Anurag Mishra
9cc5c18f36 fix: removed only custom dashboard 2019-12-10 15:20:47 +05:30
Deepesh Garg
ce42f48bfb fix: Append expense account only if expense account exists (#19880) 2019-12-10 12:15:33 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense (#19807) 
* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* fix: copy cost center from other row

* patch: set cost center in children based on parent

* fix: test cases for expense claim
 2019-12-10 08:40:10 +05:30
marination
214acc9a42 fix: Changed check condition and added test 2019-12-09 21:38:19 +05:30
Mangesh-Khairnar
0cb2783f80 fix: create unpublish log on the hub 2019-12-09 19:24:29 +05:30
Saqib
5998034b02 fix: error message displays asset category as None (#19873) 
* fix: error message displays asset category as None

* fix: asset gl_entries doesn't considers asset category's cwip account
 2019-12-09 19:07:05 +05:30
Pranav Nachnekar
ae02b4119d add init.py for appointment modules (#19823) 2019-12-09 19:03:35 +05:30
Nabin Hait
da4847e46d
patch: Set against_blanket_order value in existing SO/PO (#19810) 
* patch: Set against_blanket_order value in existing SO/PO

* Update set_against_blanket_order_in_sales_and_purchase_order.py
 2019-12-09 18:27:50 +05:30
Shivam Mishra
9e0b3b29fa feat: better message for serial number creation (#19863) 2019-12-09 18:21:23 +05:30
Deepesh Garg
88c4514024
Merge pull request #19864 from nextchamp-saqib/report-col-fix 
fix: column data not visible after manual selection of columns
 2019-12-09 17:57:12 +05:30
Saqib
7e958da6d6 fix: sales order reqd only checks for stock items (#19865) 2019-12-09 17:23:19 +05:30
thefalconx33
2944301c87 fix: website showing disabled items in list of products 2019-12-09 16:35:54 +05:30
Mangesh-Khairnar
ba48546678 fix: display new item value 2019-12-09 16:31:14 +05:30
Mangesh-Khairnar
d249d4c947 style: change formatting 2019-12-09 15:44:31 +05:30
Mangesh-Khairnar
4350846f1e fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476) 
* fix: allow creation of leave ledger entry

* feat(compensatory-leave-request): create leave ledger entry on submit

* style: add descriptive comments

* test: allow creation of leave period based on company

* fix(leave-allocation): check name of leave allocation for determining overlap

* fix: validate new leaves allocated before updating leave allocation

* test: compensatory leave request creation

* fix: skip leave entries for non expired leave allocation

* test: creation of leave ledger entry on creation of compensatory leave request

* fix: minor changes

* fix: fetch leave approver defined in employee in leave application

* fix: attendance creation and leave balance calculation

* test: create leave period for the compensatory off

* style: add descriptive method name

* test: updation of leave allocation on submit

* fix: remove db_set from compensatory off
 2019-12-09 14:27:38 +05:30
Faris Ansari
317bf5a321
feat(marketplace): Add category wise search (#19760) 
feat(marketplace): change route for category wise search
 2019-12-09 13:59:30 +05:30
Saqib
39e4f75a76 fix: get outstanding invoices btn working on submitted payment entry (#19858) 2019-12-09 13:16:35 +05:30
Deepesh Garg
babc2d1ea4 fix: Consistency in button positions in Sales Order and Purchase Order (#19833) 2019-12-09 13:04:44 +05:30
Deepesh Garg
b63101250c fix: Rounding Adjustment GL entry fix (#19838) 
* fix: Rounding Adjustment GL entry fix

* fix: Spacing in tab

* fix: Comment fix
 2019-12-09 13:03:24 +05:30
rohitwaghchaure
d2f64214cc
Merge pull request #19853 from rohitwaghchaure/fixed_production_plan_items_required_to_pull_mr 
fix: 'NoneType' object is not iterable
 2019-12-09 12:31:06 +05:30
Deepesh Garg
da638cd476 fix: NoneType' object has no attribute '__getitem_'_ (#19859) 2019-12-09 11:28:31 +05:30
Deepesh Garg
3139fa2866
Merge branch 'develop' into new_invoice_fix 2019-12-07 19:54:21 +05:30
Deepesh Garg
ddc6e42b08
Merge pull request #19836 from deepeshgarg007/gst_1_validation_msg 
fix: Validation msg fix in GSTR-1 report
 2019-12-07 19:52:43 +05:30
Rohit Waghchaure
502189913a fix: 'NoneType' object is not iterable 2019-12-07 14:10:11 +05:30
Rohit Waghchaure
6301874795 fix: timsheet overlap error 2019-12-07 13:20:37 +05:30
Rucha Mahabal
690068142b feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813) 
* feat: added illustrations for onboarding

* refactor: change help label for supplier

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

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

* fix: added a 'Continue' type slide

* fix: change text in continue slide

* fix: change text for continue slide
 2019-12-06 20:58:26 +05:30
deepeshgarg007
99309229bc fix: Add missing semicolon 2019-12-06 19:59:54 +05:30
deepeshgarg007
ad53649f41 fix: Validation msg fix in GSTR-1 report 2019-12-06 19:34:49 +05:30
Rohit Waghchaure
8ab8376975 fix: Manufacturing UX, added calendar view for job card 2019-12-06 17:40:09 +05:30
Rohan
05222270e1
Merge branch 'develop' into v12-lead-address-contact 2019-12-06 14:25:30 +05:30
Rohan
5161ba787c
Merge branch 'develop' into dev-batch-to-stock-ledger 2019-12-06 14:25:00 +05:30
Rohit Waghchaure
d98ed8047a fix: travis failing 2019-12-06 13:17:56 +05:30
Mangesh-Khairnar
015038236c fix: update hub item document 2019-12-05 02:10:57 +05:30
Mangesh-Khairnar
6d4f4bef7e fix(marketplace): autocomplete hub category 2019-12-05 01:01:01 +05:30
Himanshu Warekar
175d604f5f chore: commonize function 2019-12-04 23:08:51 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch 
feat: Provision to fetch items from multiple BOMs in Stock Entry
 2019-12-04 21:44:47 +05:30
Himanshu Warekar
5e90ad6063 Merge branch 'develop' of https://github.com/frappe/erpnext into new_invoice_fix 2019-12-04 19:01:33 +05:30
Mangesh-Khairnar
e4274cbfa6 fix: change formatting 2019-12-04 17:51:08 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
Mangesh-Khairnar
fa170e3c84 fix(marketplace): add watcher for route change to fetch new items 2019-12-04 15:59:17 +05:30
Pranav Nachnekar
114e0db419 fix: query for finding lost quotation (#19800) 
* fix: query for finding lost quotation

* Update opportunity.py
 2019-12-04 15:31:43 +05:30
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person (#19796) 2019-12-04 15:30:58 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting (#19805) 2019-12-04 15:30:01 +05:30
Mangesh-Khairnar
a830f89a59 feat: add date filter in the fixed asset register (#19799) 
* feat: add date filter in the fixed asset register

* fix: remove function from keyword argument
 2019-12-04 13:32:31 +05:30
sahil28297
eb9c3e1c5b fix(patch): set proper tax_type and proper account (#19794) 2019-12-04 12:01:31 +05:30
Khushal Trivedi
51f2131a41 fix: joining and relieving Date can be on same date as valid use case on emoloyee form (#19798) 
* 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

* Update employee.py
 2019-12-04 11:56:44 +05:30
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms 
feat: Receivable / payable summary based on payment terms
 2019-12-04 11:25:28 +05:30
thefalconx33
a639f16dc9 fix: column data not visible after manual selection of columns 2019-12-04 09:46:42 +05:30
marination
be88d0f8a3 fix: Custom button conditionally visible in draft condition as well 2019-12-03 18:34:38 +05:30
Shivam Mishra
5128f3bd0f feat: allow searching from meta fields (#19711) 
* feat: allow searching from meta fields

* feat: remove description in query based on number of items
 2019-12-03 17:27:22 +05:30
Saqib
d635bda29b fix selling setting label for sales order reqd (#19775) 2019-12-03 17:05:06 +05:30
Khushal Trivedi
73129e6ac8 fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' (#19774) 
* 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
 2019-12-03 17:03:45 +05:30
Nabin Hait
e176c3c1d1 feat: Receivable / payable summary based on payment terms 2019-12-03 16:56:48 +05:30
Deepesh Garg
8d31171ff8 fix: Party name field in trial balacne for party report (#19789) 2019-12-03 16:31:07 +05:30
rohitwaghchaure
36b60dbbef
Merge pull request #19441 from rohitwaghchaure/capacity_planning_for_workstataion_feature 
fix: capacity planning back
 2019-12-03 15:23:06 +05:30
Deepesh Garg
03d1394540 fix: Unable to see parties with negative balance in AR/AP Summary (#19776) 2019-12-03 15:12:44 +05:30
Marica
c68a940aac fix: Item qty cannot be zero in Purchase Receipt (#19779) 2019-12-03 12:59:22 +05:30
gavin
728f8d09c8 fix: AttributeError on new Student creation (#19786) 2019-12-03 12:54:46 +05:30
Nabin Hait
a0f9db4b83
Update employee.py 2019-12-03 12:51:27 +05:30
Deepesh Garg
b4b90eaaf7
Merge pull request #19762 from Mangesh-Khairnar/fix-pr-creation 
fix(sales-order): allow payment request creation for so that are not billed
 2019-12-03 10:42:01 +05:30
Anurag Mishra
de5237fbd5 refactor: Report BOM Sock Calculated (#19431) 2019-12-02 17:08:12 +05:30
Rucha Mahabal
2fa204d8be fix: render_template for subject in Email Campaign (#19772) 2019-12-02 16:26:10 +05:30
Anurag Mishra
957a6f5bd5 fix: UX/UI (#19753) 2019-12-02 14:44:17 +05:30
rohitwaghchaure
ce32f9a361
Merge branch 'develop' into capacity_planning_for_workstataion_feature 2019-12-02 11:29:06 +05:30
Mangesh-Khairnar
c131bd1b25 feat(marketplace): edit item dialog 2019-12-02 01:09:59 +05:30
deepeshgarg007
f89b172202 fix: Available stock for packing item report 2019-12-01 21:53:32 +05:30
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