Deepesh Garg
e2fdff5777
fix: Payment reco error in multicompany setup
2020-07-07 14:14:07 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query
2020-07-07 11:53:19 +05:30
Deepesh Garg
05738bd29a
fix: Remove print statements
2020-07-06 13:40:48 +05:30
rohitwaghchaure
1cc1fd4f86
Merge pull request #22576 from marination/party-details
...
fix: Check for Company before trying to fetch party details
2020-07-06 12:42:16 +05:30
Deepesh Garg
92a03aa5db
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-07-06 12:37:28 +05:30
rohitwaghchaure
e5d9ebe32e
Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix
...
fix: Consider company fiscal year for getting balance
2020-07-06 12:34:56 +05:30
Deepesh Garg
be05c4e14a
fix: Codacy and minor fixes
2020-07-05 18:16:16 +05:30
Deepesh Garg
96d40ec9da
fix: Consider company fiscal for getting balalnce
2020-07-03 22:59:00 +05:30
marination
e27b996e38
fix: Check for Company before trying to fetch party details
2020-07-03 22:12:00 +05:30
mohammadahmad1990
015910b4c4
Company Field Added in Item Tax Template
2020-07-03 15:02:32 +05:00
Deepesh Garg
9ed0384bea
fix: Code cleanup
2020-07-03 14:54:41 +05:30
Deepesh Garg
3c004ad798
fix(GST): Do not add tax amount in grand total for reverse charge invoices
2020-07-02 21:18:29 +05:30
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default ( #22521 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-02 15:11:45 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-02 12:35:41 +05:30
Deepesh Garg
8230e41a42
fix: Insert instead of DB insert
2020-06-29 21:20:05 +05:30
Deepesh Garg
d1bf6e0277
fix: Do not ignore validate methods on GLL entry submit
2020-06-29 21:14:03 +05:30
Rohit Waghchaure
04cf2e029f
fix: letter head not found in opening invoice creation tool
2020-06-28 17:08:12 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs ( #22432 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:34:01 +05:30
Deepesh Garg
2abd66da9d
fix: Update journal entry account timesstamp
2020-06-24 17:49:50 +05:30
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting
2020-06-24 10:23:23 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking ( #21671 )
...
* feat: More controller deferred revenue booking
* fix: Query for last gl entry
* fix: Accounting Dimension for Deferred entries
* fix: Deferred revenue booking against paid invoices
* fix: Don not update outstanding on Deferred Entry submission
* fix: Naming fixes
* feat: Deferred revenue/expense booking based on months
* fix: Test case for fix monthly deferred revenue booking
* fix: Typo
* fix: Patch to update settings
* fix: Test case to book deferred expense via journal entry
* fix: Update field for better UX
* fix: Codacy
* fix: Change select field to checkbox
2020-06-23 09:57:56 +05:30
Marica
b073544e06
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-06-23 02:24:35 +05:30
Rohit Waghchaure
aaed3b988f
added validation and clear fields for Apply Rule On Other
...
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730
fix(pricing_rule): apply_on logic dont get cleanup
...
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
2020-06-22 14:52:29 +00:00
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice ( #22193 )
2020-06-22 18:03:11 +05:30
Deepesh Garg
edd4aa6faa
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7
fix: Test Cases
2020-06-22 09:40:15 +05:30
Deepesh Garg
95a497cffb
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix
2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981
fix: Test
2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due
...
fix: status error in purchase invoice
2020-06-20 11:58:19 +05:30
Deepesh Garg
c70eb30e7e
Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting
2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb
fix: Move check from Stock Settings to Company Master
2020-06-20 11:55:56 +05:30
Kenneth Sequeira
b7c8037e9a
fix codacy
2020-06-19 22:33:51 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due
2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab
fix: due date filter in purchase invoice
2020-06-19 18:22:04 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry"
2020-06-19 17:29:49 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding ( #22055 )
...
* feat: Selling Desk, Dashboard and Onboarding
* chore: Selling Onboarding and fixes in Other onboardings
* chore: Dashboard and Number card Fixtures
* fix: Escape filters and Reposition Accounts Dashboard shortcut.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
Deepesh Garg
1b30ca6a36
fix: Codacy
2020-06-19 12:12:08 +05:30
Deepesh Garg
3c63f5b76b
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-06-19 11:41:21 +05:30
Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section ( #22309 )
2020-06-19 11:11:33 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year ( #21880 )
...
* feat: date filter for fiscal year
* fix: rename fieldtypes to valid_for_fieldtypes
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-18 18:18:41 +05:30
P-Froggy
c3b74affe3
fix: Set Value of wrong Bank Account Field in Payment Entry
...
Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account".
Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632
2020-06-18 01:48:37 +02:00
Kaviya Periyasamy
fec894f530
fix: modified time updated with the latest date ( #22286 )
2020-06-17 17:39:12 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis
...
fix: Travis(develop)
2020-06-15 16:12:10 +05:30
Deepesh Garg
0d880079b1
fix: Validation for group cost center
2020-06-15 12:23:24 +05:30
Deepesh Garg
817cbc4b48
fix: Minor fixes in cost center
2020-06-15 12:07:04 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address
...
fix: Billing address in for Purchase documents
2020-06-14 15:10:43 +05:30
Rohit Waghchaure
d6f9a51cbb
fix: item none not found while making sales invoice using opening invoice creation tool
2020-06-14 14:46:49 +05:30
Deepesh Garg
6760077674
fix: Billing address in for Purchase documents
2020-06-13 22:40:23 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable
...
fix: Handle cancelled entries in financial statements
2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d
fix: Distributed cost center query updation
2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1
fix: Do not select cancelled entries in financial statements
2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13
...
fix: Data not appearing properly for some fiscal_year in financial statements
2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d
fix: Data not appearing properly for some fiscal_year in financial statemets
2020-06-13 19:26:39 +05:30
Deepesh Garg
c258ac82c5
feat: Accounting entries for service item in Purchase receipt
2020-06-12 18:33:42 +05:30
Deepesh Garg
7e974c9e2c
fix: Test Cases
2020-06-12 15:29:40 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree
...
fix: Check for Company before rendering tree in Account Tree
2020-06-12 10:02:41 +05:30
Deepesh Garg
9df4532d14
fix: Travis(develop)
2020-06-11 21:33:43 +05:30
marination
c9a6e4f151
fix: Check for Company before rendering tree in Account Tree
2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request ( #22044 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-11 19:31:41 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding
...
fix: Update payment schedule based on payment terms
2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac
fix: Update payment schedule based on payment terms
2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation
...
fix: Party validation for inter-warehouse transaction
2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708
fix: Party validation for inter-warehouse transaction
2020-06-10 19:57:49 +05:30
Deepesh Garg
6e0d6bd74c
Merge pull request #22184 from deepeshgarg007/item-wise-report-export
...
fix: Item-wise sales and purchase register export
2020-06-10 18:48:35 +05:30
Deepesh Garg
08fee12266
fix: Item-wise sales and purchase register export
2020-06-10 18:33:24 +05:30
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view
...
fix: Add total debit in Journal Entry list view
2020-06-10 14:17:13 +05:30
Karthikeyan S
e9ff6d3d52
feat(Cost Center): Distributed Cost Center ( #21531 )
...
* feat: Distributed Cost Center
Squashed commit of the following:
commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Mon Mar 23 18:32:26 2020 +0530
Fix: Indentation
commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Mon Mar 23 18:26:50 2020 +0530
The validations are added to distributed cost center.
commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Thu Mar 19 22:17:25 2020 +0530
The distributed cost centers are shown with the percentage allocation in the reports
commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Thu Mar 19 13:36:04 2020 +0530
The child table distributed cost center are added to cost center doctype and then validate percentage allocation.
* fix(Distributed Cost Center): validation and filters
* fix(Distributed Cost Center): financial statement query
* fix(Distributed Cost Center): add test cases
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.
* Merge branch 'develop' into develop-distributed-cost-center
* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.
* Update creation field in general ledger report
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* creation field updated in gl_entries query
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-08 12:20:21 +05:30
rohitwaghchaure
b3b5c96749
Merge pull request #22092 from marination/shippinng-address
...
fix: Apply shipping rule without address too
2020-06-08 10:36:19 +05:30
Deepesh Garg
c01b4aa2e5
Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled
...
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:08:17 +05:30
Deepesh Garg
57f9d43c43
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:01:20 +05:30
Deepesh Garg
7135a75e5e
fix: Error when no data is present in AR/AP reeport
2020-06-03 21:51:21 +05:30
marination
0c72249403
fix: Apply shipping rule without address too
2020-06-03 14:32:07 +05:30
Deepesh Garg
60f3a2b8e7
fix: Add total debit in Journal Entry list view
2020-06-02 18:26:43 +05:30
Deepesh Garg
3609ddedbb
fix: Purchase receipt item json
2020-05-30 12:03:37 +05:30
Deepesh Garg
c96bf870e4
fix: Test Cases
2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd
Revert 'fix: tests depending on global default company'
2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356
Revert "fix: tests depending on global default company"
...
This reverts commit 1f20c99ecf
.
2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa
This reverts commit aa196c0a66
2020-05-30 11:37:36 +05:30
Deepesh Garg
52baf8f863
fix: Test Cases
2020-05-29 17:20:03 +05:30
Deepesh Garg
c897e800ed
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-05-29 11:04:20 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report ( #22021 )
2020-05-29 10:18:06 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements ( #22011 )
2020-05-28 18:36:21 +05:30
mergify[bot]
fd351f8268
fix: set fiscal year for Profit and Loss chart ( #22006 )
...
(cherry picked from commit 4afda76015
)
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2020-05-28 15:18:47 +05:30
rohitwaghchaure
af91e13435
Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix
...
fix: transaction date not found in sales invoice
2020-05-28 14:38:13 +05:30
Deepesh Garg
cfcdd52bf4
fix: Inter-company Invoice currency for multicurrency transactions ( #21984 )
2020-05-28 13:35:29 +05:30
Saqib Ansari
dd39ba0014
chore: tests
2020-05-28 13:11:04 +05:30
Saqib Ansari
603cc3d05e
fix: transaction date not found in sales invoice
2020-05-28 12:49:33 +05:30
Deepesh Garg
6fe3a24c5d
Merge pull request #21986 from deepeshgarg007/tds_computation_summary
...
fix: TDS computation summary report
2020-05-27 22:49:42 +05:30
Deepesh Garg
33a08f1ea7
fix: TDS computation summary report
2020-05-27 22:44:50 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes ( #21965 )
...
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:56:39 +05:30
Deepesh Garg
152377f84d
fix: Total for ageing column 121-Above ( #21972 )
2020-05-27 20:29:10 +05:30
Deepesh Garg
0030b95595
fix: Filtering issues in opneing invoice creation tool ( #21969 )
2020-05-27 20:27:33 +05:30
Deepesh Garg
ed2c1803df
fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary ( #21837 )
...
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report
* fix: Add future payment filter in AR/AP summary
* fix: Show unallocated future payments only till current creation date
* fix: Remove extra query
* fix: Remove debug
* fix: Condition
2020-05-27 12:46:12 +05:30
Deepesh Garg
3a723dd815
Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter
...
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:30:43 +05:30
Deepesh Garg
11ea0b1289
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:23:45 +05:30
Afshan
c0b4ec52de
fix: UX date range field separated in from and to date fields. ( #21765 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
* divided date range to seperate from and to date
* divided date range to seperate from and to date for purcase and sales register
2020-05-26 18:20:47 +05:30
Saqib
48e4abf43f
fix: fetch depreciation amount only if depr entry is made ( #21893 )
2020-05-25 19:21:08 +05:30
Chinmay D. Pai
0d147b011e
fix: set default posting_date value to None
...
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.
instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-24 00:54:04 +05:30
Deepesh Garg
29c748184c
fix: Project filter in Trial Baalance Report
2020-05-20 22:15:12 +05:30
Marica
2b04e8eef0
fix: Validate Payment Gateway only if it exists in Payment Request. ( #21805 )
2020-05-20 16:13:43 +05:30
Rohit Waghchaure
e6147ed9bc
feat: production forecasting using exponential smoothing method
2020-05-20 11:31:06 +05:30
Deepesh Garg
1b1787c61a
fix: Against voucher in General Ledger
2020-05-19 20:51:30 +05:30
Nabin Hait
ddec05ee07
Merge branch 'marination-stock-dashboard' into develop
2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721
feat: stock module dashboard and onboarding
2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text ( #21782 )
2020-05-19 19:05:42 +05:30
Shivam Mishra
31f00b6052
refactor: rename dashboards in desk page
2020-05-19 15:56:47 +05:30
rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing ( #21776 )
2020-05-19 15:54:24 +05:30
Nabin Hait
9aae6f4793
feat: accounting dashboard + desk
2020-05-18 18:03:11 +05:30
Nabin Hait
31b8be6c41
Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard
2020-05-18 11:31:30 +05:30
Deepesh Garg
ec8c28e487
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
2020-05-18 11:27:38 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company
2020-05-17 20:02:12 +05:30
Deepesh Garg
bf16956d10
Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description
...
fix(accounting): Tax Withholding Category Description default
2020-05-16 18:07:45 +05:30
Deepesh Garg
2a0e3e3515
fix: Remove strip
2020-05-16 18:07:03 +05:30
Deepesh Garg
2567815b03
Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category
...
fix(accounting): Allow 0 threshold in Tax Withholding Category
2020-05-16 17:55:51 +05:30
rohitwaghchaure
7435174300
Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue
...
fix: promotional scheme not able to save
2020-05-16 11:34:23 +05:30
Rohit Waghchaure
49dbbdc4cb
fix: promotional scheme not able to savce
2020-05-16 04:59:59 +05:30
Deepesh Garg
7be71c88f2
fix: Better validation message for group accounts ( #21725 )
2020-05-15 19:23:41 +05:30
Deepesh Garg
1b821fec4b
Merge pull request #21742 from nextchamp-saqib/payment-remark-fix
...
fix: update remark on submitting payment entry
2020-05-15 17:48:51 +05:30
Saqib Ansari
03d165ff79
fix: update remark on submitting payment entry
2020-05-15 16:39:02 +05:30
Deepesh Garg
a812ad7555
Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix
...
fix: purchase inv shows overdue for fraction of outstanding
2020-05-15 15:46:23 +05:30
Saqib Ansari
940856cc16
fix: add tests for set_status
2020-05-15 14:30:24 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries ( #21689 )
...
* fix: Add misssing dimensions in GL entries
* fix: Add project filter in trial balance report
* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Rohan
200af04657
format: better error messages for invalid coupon codes (develop) ( #21599 )
...
* format: better error messages for invalid coupon codes
* fix: remove unnecessary docstatus check
2020-05-15 12:10:34 +05:30
Deepesh Garg
33f654ebfe
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-14 22:57:27 +05:30
Deepesh Garg
8bbac6defc
fix: Onboarding and Dashboard for accounts module
2020-05-14 22:57:11 +05:30
Shivam Mishra
0fbc96cc8c
Merge pull request #21731 from prssanna/custom-chart-fix
...
fix: add heatmap_year parameter to get
2020-05-14 18:27:07 +05:30
prssanna
39cb749f95
fix: add heatmap_year parameter to get
2020-05-14 18:25:58 +05:30
Saqib Ansari
13096cdbfe
fix: invalid conditional statement
2020-05-13 22:02:56 +05:30
Saqib
2b8f307ffe
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 21:56:45 +05:30
Afshan
bd7e535885
Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice ( #21673 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
2020-05-13 19:48:42 +05:30
Saqib
7adfc34a26
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 14:02:19 +05:30
Deepesh Garg
cdeb897fff
fix: Account shortcut in desk page
2020-05-12 17:23:15 +05:30
Saqib Ansari
734bfcdfc2
fix: purchase inv shows overdue for fraction of outstanding
2020-05-12 14:11:33 +05:30
Deepesh Garg
c6bd012e72
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-12 11:30:07 +05:30
Chinmay Pai
30f26b4457
fix: do not setup charts if not setup_complete or no company found ( #21670 )
...
* fix: do not setup charts if not setup_complete or no company found
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove check for setup_complete
moved the check for setup_complete to frappe
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: return an empty dict from get_data if company not set
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-11 19:54:46 +05:30
Deepesh Garg
0defefda92
feat: Standard accounts dashboard
2020-05-11 12:14:46 +05:30
rohitwaghchaure
76dd10f48a
Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number
...
fix: wrong fieldname branch_code in add_fetch
2020-05-11 07:06:42 +05:30
Deepesh Garg
e720882410
Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report
...
fix(accounting): fix incorrect output in Budget Variance Report
2020-05-10 17:27:46 +05:30
Deepesh Garg
b81bd5f70c
fix: Formatting fixes
2020-05-10 17:24:11 +05:30
Suraj Shetty
65d3ac814d
fix: Add accidentally removed function
2020-05-09 17:39:59 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards
2020-05-09 14:15:20 +05:30
Kevin Chan
bc05855805
fix: Simplify get_dimension_account_month_map
...
This commit updates get_dimension_account_month_map to no longer show
the actual expense when there is no budget. This also removes the other
functions and queries related to it. Spaces are also converted to tabs.
2020-05-09 16:02:11 +08:00
Deepesh Garg
9b70a0ac18
Merge pull request #21663 from deepeshgarg007/gross_net_profit
...
fix: Gross and net profit report fix
2020-05-08 19:56:58 +05:30
Deepesh Garg
3392e6b80c
fix: User filters instead of hardcoded values
2020-05-08 19:53:09 +05:30
Deepesh Garg
8d9f86f781
fix: Gross and net profit report fix
2020-05-08 19:45:57 +05:30
Kevin Chan
9d81f97fe6
fix: Tax Withholding Category Description default
...
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
2020-05-08 18:01:18 +08:00
Kevin Chan
e29283630b
fix: Zero threshold in Tax Withholding Category
...
This fixes a bug in Tax Withholding Category where if it has a threshold
of 0, it doesn't apply to Purchase Invoices. The bug was fixed by
updating the condition.
2020-05-08 17:45:08 +08:00
Rohit Waghchaure
7d4ccdf240
fix: wrong fieldname branch_code in add_fetch
2020-05-08 13:27:25 +05:30
rohitwaghchaure
b310d6f372
Merge pull request #21649 from anupamvs/payment-order-fix
...
fix: Payment Order not allowing to create Payment Entry
2020-05-08 10:26:42 +05:30
Anupam K
8b52697723
Payment Order not allowing to create Payment Entry
2020-05-08 02:23:28 +05:30
Kevin Chan
b3ee6314f9
fix: Fix Budget Variance Report
...
This commit fixes a bug in Budget Variance Report where it combines the
actual expense amounts across different fiscal years. This was fixed by
updating the function and queries for computing the actual expense
amounts.
2020-05-07 18:39:47 +08:00
Kevin Chan
52189cba86
style: Improve formatting
...
This commit improves indentations and makes sql queries more readable.
2020-05-07 17:49:32 +08:00
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix
...
fix(minor): Reverse GL fix
2020-05-06 18:19:19 +05:30
Deepesh Garg
b821f22b7c
fix(minor): Reverse GL fix
2020-05-06 18:12:23 +05:30
Shivam Mishra
28436d2bc1
feat: added dashboard fixtures for accounts
2020-05-06 15:19:10 +05:30
Shivam Mishra
b2103f5470
feat: remove old fixtures
2020-05-06 15:18:43 +05:30
rohitwaghchaure
54a6c64b0f
fix: against voucher no not all records showing in case of Group By Voucher (consolidated) ( #21592 )
2020-05-05 16:17:15 +05:30
Saqib
d46696fa03
fix: cannot make payment entry against shareholder ( #21597 )
2020-05-05 16:10:47 +05:30
rohitwaghchaure
5210761e57
fix: heatmap not working for customer and supplier ( #21578 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 12:12:33 +05:30
Andy Zhu
f7a0b8b5b6
fix: fieldname update for 'Credit' and 'Debit' ( #21405 )
...
* fix: fieldname update for 'Credit' and 'Debit'
'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'
* Update journal_entry.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 12:09:28 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher ( #21564 )
2020-05-04 11:12:14 +05:30
Suraj Shetty
9a8512d01d
fix: NameError due to invalid variable
2020-05-03 20:17:47 +05:30
Suraj Shetty
9fffe254fc
refactor: Folio no validation
2020-05-03 19:10:02 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry ( #19658 )
...
* feat: process deferred accounting
* feat: maintain entry for deferred accounting
* feat: add check for automatic deferred accounting entry
* feat: add build conditions for company and account
* fix: create record for automatic processing of deferred accounting
* feat: add custom naming series
* fix: change the deferred revenue creation via hooks
* fix: add client side validations
* test: creation of gl entries on submission of process deferred accounting
* fix: add multiple validations
* patch(accounts-settings): set automatically process deferred accounting entry
* fix: On cancel function for deferred entry
* fix: Send email per process instead of per invoice
* fix: Test cases
* fix: Label
* fix: Process deferred accounting fixes
* fix: Error flag
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-02 20:09:33 +05:30
Deepesh Garg
cea4eeaa53
fix: Reverse GL Entry on cancel fix
2020-05-02 18:05:33 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop
...
feat(Accounts): Journal Entry Templates v1
2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c
fix: Add multi currency check and proper account filters
2020-05-01 18:38:13 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company ( #21548 )
2020-05-01 18:15:13 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view ( #21541 )
2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop
2020-05-01 14:20:53 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
...
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a
fix: Patch test
2020-05-01 13:26:26 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg
...
chore: validate and warn payment against paid invoices
2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab
fix: Check is child table for POS profile user
2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco
...
chore: rename bank reconciliation to bank clearance
2020-05-01 09:33:52 +05:30
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg
2020-04-30 20:08:18 +05:30
Saqib Ansari
c604109287
chore: handle credit note validation
2020-04-30 13:23:59 +05:30
Saqib
a8779872ee
feat: force cost center renaming from cost center form ( #21503 )
2020-04-30 11:28:43 +05:30
Saqib
090e6093f2
fix: list index out of range error ( #21467 )
...
* fix: list index out of range error
* fix: condititon
2020-04-30 11:04:44 +05:30
Saqib
078c95c438
fix: print heading field shown in gst section for india region ( #21499 )
2020-04-30 10:57:38 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ( #18740 )
...
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Saqib Ansari
769c0ce72b
chore: validate and warn payment against paid invoices
2020-04-29 15:19:08 +05:30
Abhishek Balam
b59e46d773
fix semicolons as per codacy review
2020-04-29 15:01:56 +05:30
Deepesh Garg
0d8f66dafa
Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase
...
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:36:08 +05:30
Abhishek Balam
e35bb16436
added journal entry template to accounting desk page
2020-04-29 12:18:33 +05:30
Deepesh Garg
3d8dadaab6
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:05:56 +05:30
Abhishek Balam
0c4ce4dbba
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-29 12:02:13 +05:30
Abhishek Balam
3b26b24af6
fix semicolons as per codacy review
2020-04-29 11:28:40 +05:30
Abhishek Balam
8dbc4e648b
rearranged fields in journal entry and journal entry type
2020-04-29 11:13:55 +05:30
Deepesh Garg
e006a76f8d
Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees
...
fix: payment request not able to make against fees
2020-04-29 09:36:37 +05:30
Rohit Waghchaure
50b4106d1d
fix: payment request not able to make against fees
2020-04-29 02:27:47 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
...
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Deepesh Garg
fa2eecc5fc
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:12:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width
...
fix: Default column width in Gross profit report
2020-04-28 12:35:50 +05:30
Anoop
b5e7ea7ab8
Merge branch 'develop' into multi_company
2020-04-28 11:38:07 +05:30
Deepesh Garg
142af4b58a
fix: Default column width in Gross profit report
2020-04-28 11:17:45 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
...
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53
fix: Test
2020-04-27 14:05:45 +05:30
Deepesh Garg
10aff8e118
fix: E-way bill fix in List view
2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b
fix: E-way bill fix in sales invoice
2020-04-27 10:50:03 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level ( #20870 )
...
* feat: Allow tax withholding category selection at invoice level
* fix: Linitng fixes
* feat: TDS calculation using common PAN
* fix: Add provision to deduct Lower TDS in purchase invoice
* fix: Consider only ref docs company while computing TDS
* fix: Default permission fixes
* fix: Add validation for dates in fiscal year
* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup ( #20932 )
...
* chore: Purchase Order Form Cleanup
* fix: Get Items from popups cleanup
* fix: Shift Set Target Warehouse next to Supply Raw Materials.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 20:07:22 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Abhishek Balam
e4e23836e7
mandatory depends on for cheque no and date, fix typo
2020-04-26 13:06:55 +05:30
Abhishek Balam
84187fb8e9
Code cleanup and improvements requested in PR:21404
2020-04-26 05:00:36 +05:30
Abhishek Balam
539c67966f
rename je template account dt
2020-04-25 18:13:01 +05:30
Abhishek Balam
fb5fbd7e0c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-25 17:59:00 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes ( #21407 )
...
* fix: Valid warehouse in woocommerce syncing
* fix: dmall fixes in gross & net profit report
* fix: company is required for getting party details
* fix: None issue while getting raw material rate based on last purchase rate
2020-04-25 14:52:05 +05:30
Abhishek Balam
d64438ff47
feat: Journal Entry Template
2020-04-25 03:13:50 +05:30
Abhishek Balam
291837e63d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-25 02:46:00 +05:30
Abhishek Balam
7bbb77e66f
feat: Journal Entry Template
2020-04-25 02:45:45 +05:30
Diksha Jadhav
7b91617303
feat(accounting): show actual qty for warehouse in sales invoice
2020-04-25 00:02:32 +05:30
Saqib Ansari
40140c63dc
fix: rate gets overwritten when pricing rule is set
2020-04-24 14:51:56 +05:30
anoop
c02eceb989
style: intendation
2020-04-23 21:15:06 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms ( #20945 )
...
* feat: Payment allocation based on payment terms
* fix: Add desccription for checkbox
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:07:36 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes ( #21179 )
...
* fix: Rename bank account type doctypes
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-23 12:19:30 +05:30
Deepesh Garg
fa8396feb5
fix: Budget against accounting dimensions ( #21268 )
...
* fix: Budget warning against custom accounting dimension
* fix: Codacy
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 10:34:57 +05:30
Rucha Mahabal
d7304519e2
fix: conflicts
2020-04-23 00:52:47 +05:30
Nabin Hait
471cf95300
Update purchase_invoice_item.json
2020-04-22 11:46:31 +05:30
Chinmay Pai
8fb863da07
chore: remove oldfieldtype from purchase invoice item ( #21365 )
...
fixes issue where framework expects data field type to be validated with
options either set to "Email" or "Phone".
removing oldfieldtype works for now, should be fixed inside framework
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 11:23:14 +05:30
Rohit Waghchaure
690855d3a1
fix: unsupported operand type issue in pricing rule
2020-04-22 02:49:48 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup ( #21230 )
...
* fix: Purchase Invoice Form Cleanup
* fix: Made Supplier field mandatory
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:00:14 +05:30
Saqib
b61d2411b1
Merge branch 'develop' into rename-bank-reco
2020-04-20 12:21:22 +05:30
Saqib Ansari
9de76de621
fix: patch
2020-04-20 12:19:27 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions ( #21313 )
2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print
...
fix: account name not showing in the gl print
2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154
fix: account name not showing in the gl print
2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop
...
fix: minor issues
2020-04-18 02:08:26 +05:30
Mangesh-Khairnar
bd14a64bfb
fix: add label to gl entry
2020-04-17 19:52:47 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales ( #21299 )
...
* fix: requested qty for customer provided item and rate for sales
* fix: requested qty for material transfer
* fix: customer provided item can be sales item
* fix: requested qty test cases
2020-04-17 10:52:28 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes ( #21296 )
...
* fix: Made received qty readonly and no-copy
* fix: Made release date mandatory
* fix: requested qty calculation fix for UOM
2020-04-16 20:11:32 +05:30
anoop
93d0c78ca5
feat: multi-company billing
...
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-16 13:01:43 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation
2020-04-16 11:23:52 +05:30
Deepesh Garg
17ab1592c7
Merge pull request #21265 from vishdha/chart_account_v13
...
fix: Chart of account importer UX improved
2020-04-16 11:21:05 +05:30
vishdha
5b36d15927
fix: fix Transalation
2020-04-16 11:13:43 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev
2020-04-15 23:48:27 +05:30
Saqib Ansari
34640777cd
fix: pos not accessible without default customer
2020-04-15 22:10:43 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer
...
feat: Provision to set Default Item Manufacturer
2020-04-15 16:35:08 +05:30
Saqib Ansari
55410e03e4
fix: tests depending on global default company
2020-04-15 12:57:55 +05:30
Saqib Ansari
1f20c99ecf
fix: tests depending on global default company
2020-04-14 19:40:25 +05:30
Rohit Waghchaure
d0f6f1808b
fix: minor issues
2020-04-14 17:26:58 +05:30
vishdha
5008be1db5
fix: message bold
2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05
fix: Chart of account importer UX improved
2020-04-14 17:17:26 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts
2020-04-14 14:05:32 +05:30
Saqib Ansari
aa196c0a66
fix: travis
2020-04-14 14:03:02 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed ( #21251 )
2020-04-14 12:53:54 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions ( #21237 )
...
Frontport of #18968
2020-04-14 11:51:48 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable ( #21227 )
2020-04-14 11:42:52 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation
2020-04-12 13:39:43 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor
2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227
fix: SQL ssyntax error
2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters
2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix
...
chore: hide redundant base received amount
2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error
2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling
2020-04-10 20:14:29 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Saqib Ansari
c9d6630f17
fix: formatting
2020-04-10 12:43:54 +05:30
Saqib Ansari
debee1c977
fix: travis
2020-04-10 12:38:44 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry
...
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
Deepesh Garg
ef220c1989
Merge branch 'develop' into pay-entry-ux-fix
2020-04-09 12:54:33 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. ( #21206 )
2020-04-09 12:01:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb ( #21190 )
2020-04-08 11:49:06 +05:30
Saqib
f93dc8dd88
fix: [ux] enforce 'get references from' in payment order ( #21175 )
2020-04-08 09:20:17 +05:30
marination
3e7a8abf29
feat: Provision to set Default Item Manufacturer
...
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
2020-04-07 21:00:57 +05:30
Saqib Ansari
e9b63e45b9
chore: hide redundant base received amount
2020-04-07 17:22:11 +05:30
Rucha Mahabal
21f5680914
fix: merge conflicts
2020-04-07 16:42:50 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request #21188 from deepeshgarg007/dimension_filter_fix
...
fix: Use separate condition for tree and normal doctype
2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab
fix: Use separate condition for tree and normal doctype
2020-04-07 15:17:06 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements ( #21020 )
...
* feat: Date range in financial statements
* feat: Add date range filter in consolidated financial statement
* fix: Handle API changes in query_report
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:16:25 +05:30
Vishal Dhayagude
8ef0609fc7
fix: Make Sales Invoice paid when it create from shopping cart ( #20879 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:07:01 +05:30
Deepesh Garg
f3c44a97f0
Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix
...
fix: payment request status fixes
2020-04-07 10:13:08 +05:30
Saqib Ansari
ca3967d52f
feat: (minor) purchase register filters
2020-04-06 18:25:23 +05:30
Saqib Ansari
b2a84fe478
chore: rename bank reconciliation to bank clearance
2020-04-06 16:32:33 +05:30
Deepesh Garg
433e58d131
feat: Add report summary in financial statements ( #20876 )
...
* feat: Add report summary API for Balance Sheet and PL report
* fix: Add summary cards in Cash flow report
* feat: Add report summary in consolidated financial statements
* fix: Remove accumulated values filter from P&L and cashflow report
* fix: set company default currency in profit and loss statement if no data
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-06 14:07:20 +05:30
Saqib Ansari
474222074b
fix: tests
2020-04-06 12:40:41 +05:30
Saqib Ansari
4de2416806
fix: change request status on payment entry cancel
2020-04-06 12:34:38 +05:30
Marica
b37f0bb052
Merge pull request #20864 from deepeshgarg007/po_supplier_skip
...
feat: Allow PI creation without PO
2020-04-06 12:15:42 +05:30
Deepesh Garg
1958749382
fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype ( #21147 )
...
* fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype
* fix: Codacy
2020-04-06 10:21:50 +05:30
Saqib
63bdf5dc74
fix: [ux] credit to & debit to error message ( #21132 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 19:35:55 +05:30
marination
2a9a5352bb
fix: Test Cases and block expense on outward entry
...
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
Saqib
e2c355f670
Merge branch 'develop' into payment-req-status-fix
2020-04-03 11:29:15 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip
2020-04-02 21:17:52 +05:30
Deepesh Garg
872fcb6cae
fix: Travis
2020-04-02 18:11:46 +05:30
Deepesh Garg
5dcd2c118e
Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos
...
fix: customer group price list not fetched in pos
2020-04-01 09:42:13 +05:30
Saqib Ansari
9a7851096c
fix: check if selling price exists then set it
2020-03-31 18:48:35 +05:30
Saqib Ansari
8ed7535e8a
fix: travis
2020-03-31 18:44:02 +05:30
Deepesh Garg
cf9347d2f5
fix: Undo unneccessary changes
2020-03-31 17:28:43 +05:30
Deepesh Garg
5fd456baa4
Merge branch 'develop' into customer-group-price-list-in-pos
2020-03-31 16:33:41 +05:30
Deepesh Garg
eeb9ba81d7
Merge branch 'develop' into project-link-for-all-accounts
2020-03-31 16:07:23 +05:30
Deepesh Garg
d45e0e0b5b
Merge branch 'develop' into billing-contact
2020-03-31 16:06:11 +05:30
Nabin Hait
95330c850c
Merge branch 'develop' into healthcare_refactor
2020-03-31 15:59:22 +05:30
Deepesh Garg
bdcc4b47d6
Merge pull request #21061 from anupamvs/customer-doctype-issue
...
fix: Adding proper error message
2020-03-31 15:30:46 +05:30
Raffael Meyer
c19330df63
fix: account groups ( #21070 )
2020-03-31 15:28:45 +05:30
Deepesh Garg
31ea093283
Merge branch 'develop' into customer-doctype-issue
2020-03-31 13:50:40 +05:30
Anupam Kumar
ee0dec8776
fix: email_to, party_type and party are not set in payment request when order made from portal ( #21084 )
...
Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>
2020-03-31 10:51:09 +05:30
Deepesh Garg
f0760dee80
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue
2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2
fix: Test cases
2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop
...
fix: not able to add equity account in the chart of accounts
2020-03-30 12:15:01 +05:30
Rohit Waghchaure
cdf80eb4ad
fix: not able to add equity account in the chart of accounts
2020-03-29 16:35:10 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix
...
fix: total currency formatting in Acc Receivable and Payable
2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed
2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message
2020-03-28 21:17:58 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix
...
fix: currency formatting in gl entry dr cr field
2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1
fix: currency formatting in gl entry dr cr field
2020-03-28 16:39:22 +05:30
Saqib Ansari
0ec01d98d6
fix: payment request status fixes
2020-03-28 16:11:23 +05:30
Saqib Ansari
8488ef8eb1
fix: customer group price list not fetched in pos
2020-03-28 14:07:09 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix
2020-03-27 21:39:16 +05:30
Shivam Mishra
cf6a814328
fix: total currency formatting
2020-03-27 19:15:59 +05:30
Anupam K
7ca28fdab5
fix: Adding proper error message
2020-03-26 15:54:15 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger ( #21021 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-26 13:37:40 +05:30
Anupam K
9725e43eed
fix: Adding proper error message
2020-03-26 00:17:09 +05:30
Deepesh Garg
bdcfab3a0f
fix: Update patch and bank form cleanup
2020-03-25 21:32:10 +05:30
Deepesh Garg
3cf70a6e79
Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop
2020-03-25 21:00:25 +05:30
Rucha Mahabal
1900a62c54
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
Deepesh Garg
75225316f0
fix: Remove quick entry from accouting dimensions
2020-03-22 21:50:22 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop ( #20987 )
...
* fix: Multiple fixes during pre-release testing
* fix: Merge conflict
2020-03-19 10:59:32 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed ( #20975 )
2020-03-18 18:23:38 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop ( #20965 )
...
* fix: Account setting words switches to US Terminology
* created united_states.js
* Remove Unwanted Spaces
* Remove all changes
* Add spaces between arguments
Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
2020-03-17 19:39:30 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups
...
fix(accounts): adjust account groups in SKR04
2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts ( #20913 )
...
* fix: Party name in Statement Of Accounts
* Update general_ledger.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-17 17:00:06 +05:30
Deepesh Garg
e7aefc1163
fix: Add check to skip PR in supplier master
2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37
fix: Add check to skip SO and DN in customer master
2020-03-17 11:43:34 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension ( #20860 )
...
* feat: Nested set filtering for accounting dimension
* fix: Remove print statement
2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix
...
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:36:32 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix
...
fix: Get invoice details only if invoice is selected
2020-03-16 15:56:32 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts ( #20940 )
...
* Add account_type and tax rate to some VAT accounts
* fix indentation
2020-03-16 15:45:05 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor
2020-03-12 19:44:27 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card
2020-03-12 17:13:03 +05:30
Saqib Ansari
af1221bcbd
chore: add tests and remove test based on allow_cost_center_for_bs_accounts
2020-03-12 17:04:17 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Ronel Cabrera
fcb54762a1
feat(Contacts): select billing contact for sales invoice
2020-03-12 16:58:59 +08:00
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor
2020-03-12 12:52:38 +05:30
Saqib
6ec4618914
fix: travis ( #20903 )
2020-03-11 16:04:00 +05:30
Saqib Ansari
706c239cf6
fix: remove enable_allow_cost_center_in_entry_of_bs_account
2020-03-11 15:17:10 +05:30
Saqib Ansari
0a42d81993
fix: cannot find get_allow_cost_center_in_entry_of_bs_account
2020-03-11 14:27:40 +05:30
Saqib Ansari
91b307e7f8
fix: project link not set in accounts other than profilt and loss accounts
2020-03-11 13:59:15 +05:30
Prssanna Desai
4fd61c3f83
fix: parameters un get function for accounts dashboard ( #20847 )
2020-03-11 12:37:56 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Deepesh Garg
4b20e852ea
fix: Get invoice details only if invoice is selected
2020-03-10 10:36:05 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register
...
fix: HSN code not visible in GST Itemised Purchase register
2020-03-10 10:05:31 +05:30