Commit Graph

5633 Commits

Author SHA1 Message Date
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