Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,851 Commits 3 Branches 0 Tags 1 GiB
69aa2e400a
Commit Graph

5514 Commits

Author SHA1 Message Date
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule (#20712) 2020-02-26 12:51:46 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop 
fix: Changes done to get valid customer and employee list on payment entry form(#20498)
 2020-02-26 12:17:47 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries (#20709) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-26 11:36:55 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting (#19035) 
* fix: Create Loan Management module

* fix: Move loan doctype for hr module to loan management

* fix: Add loan dashboard

* fix: Move loan application form hr module to loan management

* fix: Move Loan Type from hr to loan management

* fix: Move salary slip loan from hr to loan management

* fix: Create loan security pledge doctype

* fix: Create loan security type doctype

* fix: Create Loan security doctype

* fix: Add customer in loan_common.js

* fix: Import patch for loan

* fix: Add security pledging in loan doctype

* fix: Add loan application pledge doctype

* fix: Add logic for security pledgeing in loan

* fix: Add logic for security pledging in loan application

* fix: Rename Loan security doctype to Loan Security Pledge

* fix: Add doctype for loan security

* fix: Fixes in loan and loan application

* fix: Add doctypes for loan repayment

* fix: Fixes in loan and loan application

* fix: Move loan repayment report from HR module to loan management

* fix: Create doctype for loan security price

* fix: Create doctype for loan security shortfall

* fix: Make fields in Loan shortfall readonly

* fix: Make loan type submittable

* fix: Add daily job for loan security revaluation in hooks.py

* fix: Add loan management module

* fix: Doctype for loan disbursement Entry

* fix: GL entry fix for loan disbursement

* fix: Add company currency options in Loan related doctypes

* fix: Changes in Loan Doctypes

* fix: Allow miltiple loan securities in Loan Security Pledge

* fix: Add proposed pledges in Loan Application

* fix: Add test cases for loan

* fix: Interest Accrual Entry for loans

* fix: Remove loan from journal entry

* fix: Update triggers in loan_common.js

* fix: Accrual Entries for loan Interest

* fix: Proposed Pledges for loan application

* fix: Update items in loan management module

* fix: Allow multiple disbursements against a loan

* fix: Add loan security code in loan security master

* fix: Allow multiple securities in a single pledge

* fix: Spelling and label fixes

* fix: Replace date in loan security price with datetime

* fix: Add dashboard to loan master

* fix: Move Repayment Schedule from HR to Loan Management

* fix: Add back jobs for loan accrual entries

* fix: Multiple fixes in loan

* fix: Multiple fixes in loan application

* fix: Loan Reapayment for term loans

* fix: Interest Accural Entries for term loans

* fix: Changes in Loan Doctypes

* fix: Add test case for term loan repayment

* fix: Add custom button to update loan security price and trigger shortfall

* fix: Usability fixes in Loan management

* fix: Multiple usablity and doctype fixes

* fix: Muliple bug and usability fixes in loan

* fix: Test case fixes for loan repayment from Salary

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Minor fix in validate_repayment_method

* fix: Test case and codacy fixes

* fix: Provide consistent naming series to loan doctypes

* fix: Loan Application fix

* fix: Loan Application Dashboard

* fix: Add doctypes to process loan interest accural and loan security price

* fix: Provision to make loan topup

* fix: Pledge and unpledge statuses and doctype for loan securit unpledge

* fix: Multiple fixes in Loan Cycle

* fix: Add missing dashboards to loan doctypes

* fix: Add Loan Manager role to loan doctypes

* fix: Loan Process fixes

* fix: Loan Security Unpledge fixes

* fix: UX, List and dashboards fixes

* fix: Minor fixes

* fix: Minor fixes

* fix: Status on additional loan security

* fix: Codacy fixes

* fix: Multiple fixes in loan

* fix: Rename Process Loan Security Price to Process Loan Security Shortfall

* fix: Loan Repayment and Closure report

* fix: Loan Security Status report and minor fixes

* fix: Multiple UX fixes

* fix: Test Case fixes and UX fixes

* fix: Currency symbol fixes in Salary Slip Loan

* fix: Make loan account details read only

* fix: Changes in loan security price updation

* fix: Sanctioned Loan Amount doctype

* fix: Updates in process loan interest accrual

* fix: Pass loan doc instead of loan name

* fix: Fixes in process loan interest accrual

* fix: Add missing semicolon

* fix: Test case

* fix: Test case

* fix: Sandbox method to get proposed pledges

* fix: Sandbox method

* fix: Nonetype fix in loan sanction limit

* fix: GL entry fixes

* fix: Update maximum loan amount on loan security pledging

* fix: Round  off loan amounts

* fix: Loan Security unpledging

* fix: Interest amount for loan closure

* fix: Due date for loan repayments

* fix: API fixes for loan disbursement method

* fix: Disable quick entry for sanctioned loan amount

* fix: Add misssing translations for validations and codecleanup

* fix: Translation fixes and code cleanup

* fix: Test Cases

* fix: Loan Interest Accrual test case
 2020-02-26 10:44:24 +05:30
Deepesh Garg
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue 
fix: account dashboard not working
 2020-02-26 10:18:03 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return (#20543) 
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
 2020-02-25 13:21:16 +05:30
Rohit Waghchaure
ebdf80ddb5 fix: account dashboard not working 2020-02-24 18:45:47 +05:30
Saqib
ca7f53b4ea
chore: SINV set_status remove redundant function calls (#20660) 
* chore: SINV set_status remove redundant function calls

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

Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-02-20 12:32:05 +05:30
Saqib
cfe2db6d77
fix: mandatory on hold comment for purchase invoice (#20666) 2020-02-20 12:29:44 +05:30
Deepesh Garg
ad246a4415
Merge pull request #19856 from alyf-de/skr03_gnucash 
feat(accounts): add german CoA "SKR03" (GnuCash)
 2020-02-19 19:21:51 +05:30
Deepesh Garg
0a6314ab92
Merge pull request #20659 from deepeshgarg007/plaid_fix_develop 
fix: Plaid fixes and enhancements
 2020-02-18 18:09:01 +05:30
Deepesh Garg
16445305d5 fix: Styling and minor fixes 2020-02-18 18:04:09 +05:30
racitup
547a0bb909 fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions 2020-02-18 17:49:57 +05:30
racitup
719678957a fix: Bank Reconciliation Bank Account and Bank Account No field names 2020-02-18 17:49:45 +05:30
racitup
1548e20b78 fix: KeyError about bank_account_no due to non-existent field: #20343 2020-02-18 17:49:08 +05:30
racitup
7cda218af3 fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343 2020-02-18 17:48:54 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report (#20573) 
* feat: Group by AR/AP report

* fix: Do not consider total row in charts

* fix: Subtotal row for last party
 2020-02-18 16:07:34 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix 
fix: disabled mode of payments fetches in sales invoices
 2020-02-18 12:38:06 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
P-Froggy
3cb9f4ab73 Add address and contact fields to bank 
Address and contact fields are enabled for DocType Bank
 2020-02-18 02:14:03 +01:00
P-Froggy
4cc929cabb Move SWIFT-number and branch-code from bank account to bank 
The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.
 2020-02-18 00:38:46 +01:00
thefalconx33
23e728612f fix: disabled mode of payments fetches in sales invoices 2020-02-17 14:15:20 +05:30
Yugandhara
ad645afeb2 fix: Changes done to get valid customer and employee list on payment entry form 2020-02-15 10:56:41 +05:30
Raffael Meyer
0fac1f9429 Add groups for account types "Bank" and "Cash" 2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355 Merge branch 'develop' into skr03_gnucash 2020-02-12 13:58:53 +01:00
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop 
fix: added indexing on columns to fix performace issue
 2020-02-11 10:12:49 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register (#20251) 
* fix: Group by sales register report

* fix: Remove group-by item

* fix: Grand total query fix

* fix: Remove debug param

* fix: Code cleanup and commonification

* fix: Add group by functionality to purchase register

* fix: Changes in total row display

* fix: Minor fixes

* fix: Add total row

* fix: Do not calculate total for rate
 2020-02-10 17:59:17 +05:30
Rohit Waghchaure
50886f02c3 fix: added indexing on columns to fix performace issue 2020-02-10 15:56:56 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups (#20547) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-09 21:23:53 +05:30
Deepesh Garg
30e766b228 fix: SQL query in financial statements 2020-02-05 12:12:47 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer (#20465) 
* fix: Label and UX fixes while creating payment entry against customer

* fix: filter
 2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile (#20413) 
* feat: add tax category in pos profile

* fix: review fixes
 2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements (#20486) 2020-02-03 15:49:24 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new 
fix: Do not show any finance book record if no finance book filter is applied
 2020-01-31 13:19:16 +05:30
Deepesh Garg
34c33baa82 fix: Cash flow filter fix 2020-01-31 11:16:30 +05:30
Deepesh Garg
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8 fix: Do not show any finance book record if no finance book filter is applied 2020-01-30 15:33:51 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test 2020-01-30 13:03:05 +05:30
Raffael Meyer
e21cd5e7f1 fix: account number for "Kasse" 2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218 fix: add missing account types 2020-01-29 22:21:19 +01:00
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
3fb48ebf61 fix: discounting not applied on sales invoice created by subscriptions (#20431) 2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f fix: Column 'project' in where clause is ambiguous (#20438) 
* fix: Column 'project' in where clause is ambiguous

* fix: Fixed alias in query
 2020-01-28 12:43:38 +05:30
Deepesh Garg
ef41a0eda5 fix: Finance book filtering in financial statements (#20410) 
* fix: Finance book filtering in financial statements

* fix: Use IS NULL instead of ifnull
 2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1 fix: incorrect status for fraction of outstanding amount (#20369) 2020-01-27 14:22:43 +05:30
Saqib
9291df4d4c fix: wrong outstanding invoices fetched against employee (#20373) 2020-01-24 16:22:49 +05:30
Deepesh Garg
60e8d52f32
Merge pull request #20401 from deepeshgarg007/general_ledger_sort 
fix: Order GL entries by creation time in General ledger
 2020-01-24 13:19:39 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +05:30
deepeshgarg007
fdba26d476 fix: Order GL entries by creation time in General ledger 2020-01-23 17:42:57 +05:30
Rohit Waghchaure
4f4dbf1996 fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:45:45 +05:30
rohitwaghchaure
5056c8bcb4 fix: not able to import chart of account if parent account is missing (#20368) 2020-01-21 15:32:26 +05:30
Saqib
eea0ffcb38 fix: account not added to child company (#20361) 2020-01-21 15:25:51 +05:30
Saqib
bcb6130bbe fix: hide total amount field from journal entry PF (#20324) 2020-01-16 13:38:43 +05:30
sahil28297
32d643ed3c fix(patch): reload tax category (#20308) 2020-01-15 18:57:54 +05:30
Saqib
617a24191f fix: get existing payment req amount only from unpaid req (#20289) 2020-01-15 16:36:13 +05:30
Shivam Mishra
a59c2ce17a fix: profit and loss indicator bug 2020-01-14 17:55:49 +05:30
Shivam Mishra
748c3d9e8b feat: update profit and loss for new report summary API 2020-01-14 17:31:19 +05:30
Saqib
1218160c70 fix: payment entry can be created against on hold PI (#20270) 2020-01-14 12:07:24 +05:30
Deepesh Garg
16b8673554
Merge pull request #20257 from nextchamp-saqib/revery-jv-fix 
fix: remove default customer as party type
 2020-01-13 13:48:55 +05:30
thefalconx33
f04d054faa fix: remove default customer as party type 2020-01-13 12:43:49 +05:30
rohitwaghchaure
d4d7d211ea feat: report to show difference between stock and account value (#20186) 2020-01-09 15:05:05 +05:30
Marica
287f491f7b fix: Employee name in Report trial balance for party (#20223) 
* fix: Employee name in Report trial balance for party

* fix: Add account filter in trial balance for party report

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-01-09 13:35:06 +05:30
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes (#20135) 
* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-06 15:34:15 +05:30
rohitwaghchaure
b5f91bea90
Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request 
fix: incorrect party type in payment request
 2020-01-06 15:16:42 +05:30
Rohit Waghchaure
8641f9ce77 fix: party type in payment request 2020-01-06 15:07:06 +05:30
Syed Mujeer Hashmi
03bf1a875f feat: Allow write-off for Fees doctype 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2020-01-04 13:26:42 +05:30
rohitwaghchaure
52c5fb33d7
Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop 
fix: ignore pricing rule for other item group
 2020-01-02 19:24:37 +05:30
Rohit Waghchaure
660a78b877 fix: ignore pricing rule for other item group 2020-01-02 17:31:09 +05:30
deepeshgarg007
473b478883 fix: Show closing row in general ledger print 2020-01-02 12:22:04 +05:30
Raffael Meyer
5d6fada431 feat: add accounts and account types 2020-01-01 22:55:54 +01:00
Javier Wong
5cc7648e9c [Fix] Allow Print Before Pay in POS (#20151) 
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
 2019-12-31 17:07:37 +05:30
Saqib
cb7043fd9d fix: party account currency not fetched from account for SO (#20146) 2019-12-31 13:55:13 +05:30
Marica
5483f1a27e fix: Field 'other_charges_calculation' column type changed. (#20141) 2019-12-30 22:20:02 +05:30
Rucha Mahabal
3ac39ba28d fix: format currency field in bank and cash payment voucher print format (#20137) 2019-12-30 15:18:07 +05:30
Saqib
7e57ede35b fix: unpaid invoices are created even if current invoice is paid (#20081) 2019-12-27 13:02:13 +05:30
Deepesh Garg
1a2e4fa36d
Merge pull request #20087 from nextchamp-saqib/pay-reco-fix 
fix: undefined dr_or_cr_notes in case of party type Employee
 2019-12-27 08:13:09 +05:30
thefalconx33
81d0861506 fix: undefined dr_or_cr_notes in case of party type Employee 2019-12-26 14:42:11 +05:30
thefalconx33
6291ca8e40 fix: only show doctypes which impact accounting in accounting period 2019-12-26 13:55:35 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos 
feat: provision to select the custom fields in the online POS
 2019-12-26 13:40:43 +05:30
Rohit Waghchaure
682273a00b feat: provision to select the custom fields in the online POS 2019-12-26 11:59:19 +05:30
Mitchy25
fee8340f98 fix: Bank Reconciliation Allows to Over Reconcile (#19461) 
* Update bank_reconciliation.py

* fix: improve error message while over reconciling

* fix: only check over-reconciliation when against payment entry

Co-authored-by: Saqib <thefalconx33@gmail.com>
 2019-12-24 18:02:18 +05:30
Don-Leopardo
ec258a43d9 perf: Asset Depreciations and Balances report (#18022) 2019-12-24 17:35:53 +05:30
Pranav Nachnekar
b972f763f3 fix: added validation for cost center (#19932) 
* fix: add validation for cost centers in sales invoice

* use `get_cached_value` for getting compnay, formatting of error message
 2019-12-24 16:46:46 +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
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
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
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
9078607600 fix: paid amount gets overwritten by get_outstanding_invoices (#20050) 2019-12-23 16:25:16 +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
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
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
thefalconx33
7e68f050d9 fix: account manager doesn't have cancel submit perm for share transfer 2019-12-20 14:50:25 +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
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
Rohit Waghchaure
2ae79b8ac2 fix: Pricing Rule Discount for Product 2019-12-18 17:53:21 +05:30
deepeshgarg007
be8c406808 fix: Update sales register report 2019-12-17 22:27:23 +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
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
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
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
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement 2019-12-14 22:49:53 +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
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
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
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
prssanna
2ef26fbb07 fix: empty fname and fcontent of uploaded file 2019-12-11 14:21:04 +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
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
Deepesh Garg
ce42f48bfb fix: Append expense account only if expense account exists (#19880) 2019-12-10 12:15:33 +05:30
Saqib
7e958da6d6 fix: sales order reqd only checks for stock items (#19865) 2019-12-09 17:23:19 +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
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
Raffael Meyer
af9c5fda9e rename CoA 2019-12-07 14:22:51 +01:00
Raffael Meyer
05d708b51c add some missing accounts 
Aktive Rechnungsabgrenzung
Passive Rechnungsabgrenzung
Kasse
Verblk. aus Lohn und Gehalt
Erlöse
 2019-12-07 14:21:22 +01:00
Raffael Meyer
d86cefe1a5 first draft 2019-12-07 13:10:44 +01:00
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
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
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
Deepesh Garg
03d1394540 fix: Unable to see parties with negative balance in AR/AP Summary (#19776) 2019-12-03 15:12:44 +05:30
Deepesh Garg
06a6fa4cfc feat: Accounts Payable report based on payment terms (#19672) 2019-11-29 16:56:27 +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
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
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
Marica
8f48896261 fix: Permission issue in Stock Entry (#19738) 2019-11-28 19:39:49 +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
Shivam Mishra
2512962f55 fix: handle None case for get_shipping_amount_from_rules (#19723) 2019-11-28 16:46:58 +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
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
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +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
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
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
Mangesh-Khairnar
b10526dd86 fix: consider taxes in the grand total (#19631) 2019-11-22 12:28:33 +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
Rucha Mahabal
45e9dd9c51 fix(Journal Entry): default Cash Entry account not getting fetched 2019-11-20 11:40:38 +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
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
thefalconx33
353f73a153 fix: stock qty not displayed in pos 2019-11-19 18:37:21 +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
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
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
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
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
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
Nabin Hait
732d6afad5
fix: Show AR summary based on outstanding (#19573) 2019-11-13 18:49:23 +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
deepeshgarg007
5ea4328359 fix: Accumulated Values filter disappearing 2019-11-13 13:23:49 +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
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
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
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
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
Nabin Hait
628701f1a5
fix: Accounts mandatory depending on share transfer type (#19523) 2019-11-07 18:05:40 +05:30
Marica
e37a67245e fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388) 2019-11-07 12:52:23 +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
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
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
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
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
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
Suraj Shetty
77e4cf89f8 fix: Pass parent_acc_name (#19450) 2019-10-31 15:57:31 +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
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
Anurag Mishra
07b908c0c5 patch: Missing Patch for item Tax template 2019-10-28 16:00:24 +05:30
Rohit Waghchaure
8916916a03 fix: 'NoneType' object is not iterable 2019-10-28 13:00:18 +05:30
Jai Chavan
9f483c1fa9
fix: Spelling of Variance 2019-10-26 18:45:01 +05:30
Pranav Nachnekar
d5166861de
fix:setting incorrect field for party bank account 
Previously
![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif)

Corrected
![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif)
 2019-10-23 07:46:00 +00:00
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
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
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30
Rohit Waghchaure
66072fec5a fixed conflicts 2019-10-15 14:18:59 +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
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
2d064ee67a fix: Remove bold property from disable checkbox (#19280) 2019-10-11 10:43:38 +05:30
Kenneth Sequeira
a54b7542f1 fix: sales invoice labels (#19267) 2019-10-10 18:50:39 +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
41a6548acb fix: Label and dependes on fixes in Bank Account (#19245) 2019-10-04 16:22:00 +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
thefalconx33
4723da0251 fix: #19239 2019-10-03 13:06:43 +05:30
Sahil Khan
c5a6e9da15 Merge branch 'develop' into version-12 2019-10-02 16:36:54 +05:30
Deepesh Garg
b54f0fb388 fix: Party column empty in accounts receivable/ payable summary (#19205) 2019-09-30 15:19:56 +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
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
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
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
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
Rucha Mahabal
132323462c fix(Report): Sales Register (#19166) 2019-09-25 16:03:45 +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
824376a045 fix(Journal Entry): Opening Entry not fetching accounts (#19148) 2019-09-24 19:13:55 +05:30
Deepesh Garg
d9e9d562f8 fix: Travis (develop) (#19140) 
* fix: Travis

* fix: Syntax Error
 2019-09-24 11:44:52 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +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
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
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
marination
8590112faa fix: Report 'Payment Period based On Invoice Date' 2019-09-19 17:48:23 +05:30
rohitwaghchaure
d019d28bc9 fix: Customer Ledger Summary report not working on python 3 (#19092) 2019-09-17 18:45: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
Rohit Waghchaure
094612dc02 fix: plc conversion issue for offline pos 2019-09-17 13:04:28 +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
Nabin Hait
b50b5095ad
fix: Added field disabled instead of enabled in cost center (#19065) 2019-09-16 19:44:37 +05:30
Mangesh-Khairnar
dce04b7335 fix: filter for payment order (#19070) 2019-09-16 19:40:27 +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
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
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
Nabin Hait
93a9c08116
fix: Allocate payment amount in reference table on change of payment amount (#19041) 2019-09-13 15:48:50 +05:30
Rucha Mahabal
72949e7f73 fix: share transfer validations for journal entry (#19018) 
* fix share transfer validations for journal entry

* fix: share transfer test

* fix: tests
 2019-09-13 11:05:40 +05:30
Nabin Hait
a5dfe0725f
fix: payment against shareholder (#19019) 2019-09-12 19:17:24 +05:30
Sammish Thundiyil
504e52ff46 refactor: cost center (#19011) 
* 	modified:   erpnext/accounts/doctype/cost_center/cost_center.json

* fix: removed unique property from cost_center_name
 2019-09-12 13:48:41 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well 2019-09-11 18:39:49 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document (#18988) 2019-09-11 12:43:27 +05:30
Nabin Hait
a035428d43 fix: handling of key does not exists error 2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c Merge branch 'develop' into version-12 2019-09-10 14:38:39 +05:30
Sammish Thundiyil
bcda12f4bb modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json (#18829) 2019-09-10 14:11:02 +05:30
Anurag Mishra
89d3bc0b54 fix: sales invoice return print format overideing the meta default print format 2019-09-09 15:58:25 +05:30
Prssanna Desai
ddfbb07c3b fix: fix accounts balance timeline dashboard chart source (#18942) 
* fix: fix accounts balance timeline dashboard chart source

* fix: pass chart_name to get function instead of chart object
 2019-09-06 15:38:06 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Marica
a93b665427 fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List (#18937) 
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
 2019-09-05 18:26:45 +05:30
Nabin Hait
b847731482 Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit 2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring (#18931) 2019-09-05 16:43:20 +05:30
Raffael Meyer
48d1463825 fix(CoA): SKR04 (#18820) 
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
-  move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
 2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5 Party accounts if don't have default company (#18771) 
Add check for get_default company
 2019-09-05 15:14:09 +05:30
Nabin Hait
16a7ec95dc fix: tax category is optional argument 2019-09-05 13:01:15 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py 2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb
Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working 
fix: offline pos item search not working
 2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659 fix: offline pos item search not working 2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1 feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647) 
* feat: employee incentive and retention bonus added in additional salary

* fix: added salary component field, logic improved

* fix: codacy review
 2019-09-03 20:45:52 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report (#18906) 2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501
Merge branch 'develop' into feat-customer-credit-limit 2019-09-03 14:20:17 +05:30
Deepesh Garg
c174e4d01a fix: Default message from Payment Gateway Account not fetching (#18848) 2019-09-03 14:17:41 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
deepeshgarg007
402d82b4c5 fix: Remove delete_doc from tests 2019-09-02 14:37:18 +05:30
Himanshu Warekar
711d1acffd fix: remove references of mobile_no 2019-09-02 13:31:10 +05:30
Himanshu Warekar
81472e4c08 Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref 2019-09-02 13:21:29 +05:30
Himanshu Warekar
b8f23c2657 fix: fix query for contacts 2019-09-02 13:20:27 +05:30
Suraj Shetty
4a8710ef75
Merge pull request #18611 from surajshetty3416/fix-paid-amount 
fix: Paid amount 0 while creating advanced payment entry
 2019-09-02 08:38:34 +05:30
Mangesh-Khairnar
79525327f0 feat: bypass credit limit check 2019-08-29 19:50:23 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd fix: show a descriptive message on submission of duplicate account (#18486) 
* fix: show a descriptive message on submission of duplicate account

* Update account.py
 2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py 2019-08-23 12:27:05 +05:30
Anurag Mishra
db88476f8b feat: refactor invoice_discounting (#18629) 
* feat: refactor invoice_discountig

* Update invoice_discounting.py

* Update invoice_discounting.js
 2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe fix: POS Sync Issue (#18807) 2019-08-23 11:13:58 +05:30
Suraj Shetty
6689ed543a
Merge branch 'develop' into fix-paid-amount 2019-08-23 10:42:23 +05:30
rohitwaghchaure
224d857928
Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop 
fix: reconciled entry has not clearance date set
 2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df
Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop 
fix: debit note not reconciled with another purchase invoice using pa…
 2019-08-21 23:35:35 +05:30
Anastes Mp
a6c6e02c49 Incorrect database table (#18558) 
Fixed Unknow Column tax_type error on offline pos
 2019-08-21 16:53:06 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry (#18792) 2019-08-21 14:47:33 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
rohitwaghchaure
16dda1a991 fix: group by voucher consolidated showing incorrect data for deferred entries (#18779) 2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf fix: group by voucher consolidated showing incorrect data for deferred entries (#18777) 2019-08-20 12:35:15 +05:30
Mangesh-Khairnar
c97a7fb845 fix: restrict the payment order to non received type payment entries 2019-08-20 00:27:43 +05:30
Rohit Waghchaure
1008e6e450 fix: debit note not reconciled with another purchase invoice using payment reconciliation 2019-08-19 20:27:15 +05:30
Mangesh-Khairnar
4645727163
Merge branch 'develop' into fix-payment-order 2019-08-19 16:29:30 +05:30
Deepesh Garg
960a1cbd8f fix: Party dashboard heatmap not capturing sales, purchase and other activities (#18753) 2019-08-19 11:51:16 +05:30
Anurag Mishra
bc5712a1b3 fix: validated cost center in financial_statement (#18733) 
* fix: validated cost center in financial_statement

* Update financial_statements.py
 2019-08-19 10:24:44 +05:30
Deepesh Garg
77ec3cf402
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix 
fix: Default dimensions in child doctypes
 2019-08-16 17:27:14 +05:30
deepeshgarg007
42d9298318 fix: Remove extra space 2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f
Merge branch 'develop' into fix-payment-order 2019-08-16 12:42:26 +05:30
deepeshgarg007
2fb6bc9867 fix: Default dimensions in child doctypes 2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact 
fix: sequence of customer name and contact in the AR report
 2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f fix: sequence of customer name and contact in the AR report 2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950 fix: restrict the payment order to non received type payment entries 2019-08-14 17:38:44 +05:30
Anurag Mishra
78690d7b8b fix:payment ammount validation for pos invoices (#18663) 2019-08-14 15:03:58 +05:30
Deepesh Garg
2c5dcbe819 fix: Error handling in payment entry (#18720) 2019-08-14 14:26:37 +05:30
rohitwaghchaure
4d7a0aaee1
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission 
fix: Check if account passed is accessible under Payment Entry
 2019-08-13 18:37:17 +05:30
Anurag Mishra
d2f13fe0a6 fix: query (#18709) 2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38 Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission 2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97 fix: Re-organise code 2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea fix: Ignore account permission check 2019-08-13 12:09:06 +05:30
Suraj Shetty
bd2e7c0e53
fix: Comment description 2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299 fix: Check if account passed is accessible under Payment Entry 2019-08-12 16:18:36 +05:30
Rohit Waghchaure
fb23773935 fix: reconciled entry has not clearance date set 2019-08-12 15:35:19 +05:30
Deepesh Garg
0b711d1f8a
Merge pull request #18684 from marination/fixes_v12 
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
 2019-08-10 17:26:54 +05:30
marination
9839a9afb0 fix: Fixed error message in Payment Entry for outstanding invoices not found via filters 2019-08-09 15:54:18 +05:30
marination
4583100537 fix: Fixed error message in Payment Entry for outstanding invoices not found via filters 2019-08-09 15:30:05 +05:30
rohitwaghchaure
536e6bf57c fix: group by condition in the payment reconciliation (#18657) 2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec fix: accounting period (#18477) 
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
 2019-08-08 17:39:13 +05:30
Deepesh Garg
f2bf76a2ef fix: Show Cr or Dr symbol in chart of accounts based on balance (#18653) 
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
 2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035 fix: Show Cr or Dr symbol in chart of accounts based on balance (#18654) 
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
 2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650 fix: Changes in print format due to attribute name changes in frappe (#18639) 2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0 fix: Changes in print format due to attribute name changes in frappe (#18641) 2019-08-08 15:51:50 +05:30
Mangesh-Khairnar
e5c733bdb3 fix: Accounting period (#18630) 
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
 2019-08-08 15:44:11 +05:30
Suraj Shetty
0c699f0726 fix: Paid amount 0 while creating advanced payment entry 
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.

Solution: Populate paid amount value after applying conversion rate
 2019-08-07 10:17:05 +05:30
Deepesh Garg
235166ec41
Merge pull request #18592 from deepeshgarg007/utils_fix_v12 
fix: Ambigious column in query
 2019-08-05 22:38:45 +05:30
Deepesh Garg
e4abaa7cdd
Merge pull request #18591 from deepeshgarg007/utils_fix_develop 
fix: Ambigious column in query
 2019-08-05 14:45:30 +05:30
deepeshgarg007
23f30cdb8b fix: Aambigious column in query 2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6 fix: Aambigious column in query 2019-08-05 12:40:50 +05:30
Anurag Mishra
08df6bda41 fix: query (#18468) 2019-08-05 10:27:25 +05:30
Anurag Mishra
7e1987ed48 feat: validate cwip accounts for journal Entry (#18518) 2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0 feat: validate cwip accoutns in journal entry (#18519) 2019-08-05 10:18:37 +05:30
deepeshgarg007
a499079250 fix: Remove non standard fieldname 2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12 2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc fix: Remove payment order from bank dashboard 2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8 fix: Remove payment order from bank dashboard 2019-08-03 10:17:44 +05:30
Sahil Khan
8426ff726a Merge branch 'version-12-hotfix' into version-12 2019-08-02 14:27:59 +05:30
deepeshgarg007
c16ef32b6b fix: Payment Order link fix in bank dashboard 2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39 fix: Payment Order link fix in bank dashboard 2019-08-01 13:24:48 +05:30
Deepesh Garg
d301d26fda fix: Enhancement in credit note (#18511) 
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
 2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16 fix: Enhancement in credit note (#18510) 
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
 2019-07-31 15:58:01 +05:30
deepeshgarg007
107c07e5cb fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0 fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 14:57:33 +05:30
deepeshgarg007
f37fb82069 fix: Code cleanup 2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2 fix: GL entry validation fix 2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91 fix: Test cases for accounting dimensions 2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb fix: Test Cases for accounting dimensions 2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b fix: Set query fix 2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c fix: Codacy Fixes 2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1 fix: Remove dimensions from boot 2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79 fix: Added default dimension and filter in bootinfo 2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310 fix: Default Accounting Dimensions in doctypes 2019-07-29 12:14:49 +05:30
rohitwaghchaure
8c8b1f2da6
Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12 
fix: multi currency bank reconciliation issue
 2019-07-29 11:40:40 +05:30
deepeshgarg007
ec421df4e4 fix: Code cleanup 2019-07-29 08:58:56 +05:30
deepeshgarg007
a65ad10c62 fix: GL entry validation fix 2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241 Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension 2019-07-27 18:11:34 +05:30
Aditya Hase
dc4452ffe3
perf(travis): Faster builds (#18491) 
perf(travis): Faster builds
 2019-07-26 13:44:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster 
perf(travis): Faster builds
 2019-07-26 12:41:01 +05:30
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp 
fix(Account): Pass parent currency to child currency
 2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab
Merge pull request #18493 from netchampfaris/parent-account-child-account-currency 
fix(Account): Pass parent currency to child currency
 2019-07-26 12:12:15 +05:30
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc fix: Test cases for accounting dimensions 2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc fix: Test Cases for accounting dimensions 2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c fix: Set query fix 2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb fix: Codacy Fixes 2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4 fix: Default Accounting Dimensions in doctypes 2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c fix(Account): Pass parent currency to child currency 
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
 2019-07-26 08:55:34 +05:30
Faris Ansari
6998412990 fix(Account): Pass parent currency to child currency 
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
 2019-07-26 08:15:45 +05:30
Aditya Hase
0d333894c9 perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 05:54:04 +05:30
Aditya Hase
6a5b7f751c perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 00:23:13 +05:30
deepeshgarg007
f56284b0c1 Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:47:32 +05:30
deepeshgarg007
53dc0c52ca Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:44:50 +05:30
Rohit Waghchaure
6d0c6a17d9 fix: multi currency bank reco issue 2019-07-24 12:48:06 +05:30
Rushin Parikh
40240b7d96 fix: filter reference name by cost center in journal entry account (#17948) 
* fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice

* Update journal_entry.js
 2019-07-22 11:54:26 +05:30
Mangesh-Khairnar
0bbfca8142 fix: payment document link fix (#18301) 2019-07-22 11:49:18 +05:30
Mangesh-Khairnar
64c780e8c7 fix: update percentage on creation of invoice for zero amt transaction (#18382) 2019-07-22 11:28:58 +05:30
Saurabh
90d7a8888f fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398) 2019-07-22 11:22:34 +05:30
Aditya Hase
dc42cc3998 fix(sales-invoice): Use orm instead of frappe.db.sql (#18434) 2019-07-22 11:19:07 +05:30
crescent28
b978c9173d fix: added null check for filters (#18416) 
filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome! 

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2019-07-22 11:13:27 +05:30
Rohit Waghchaure
93b7ece8b0 fix: disable field's fieldtype changed from data to check 2019-07-21 00:02:09 +05:30
deepeshgarg007
2ddbebfae0 fix: Condition fix 2019-07-20 14:52:59 +05:30
deepeshgarg007
e097d4f470 fix: Assignment fix 2019-07-20 14:49:32 +05:30
deepeshgarg007
1ee3d040a1 fix: Condition fix in get_balance_on function 2019-07-20 14:46:59 +05:30