Commit Graph

5662 Commits

Author SHA1 Message Date
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts (#22901)
* feat: Process Statement Of Accounts initial commit

* fix: add jinja supported inputs for subject and body in email settings

* feat: utils support in template, tested autoemail, fixed issues
2020-08-11 16:23:47 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return (#22942)
* feat: adding return naming series

* Update purchase_invoice.json

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-11 16:11:20 +05:30
Afshan
acc3d42cf0
fix: escape apostrophe in company name if exist (#22956)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 14:40:44 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field 2020-08-11 10:22:32 +05:30
Deepesh Garg
069a54e5c3 fix: Cancellation of accounting transactions within closed accounting period 2020-08-10 16:01:01 +05:30
Deepesh Garg
372abaa420
Merge pull request #22976 from marination/sales-taxes-dashboard
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:59 +05:30
marination
0f27500197 fix: Susbcription in Sales Taxes and Charges Dashboard 2020-08-10 15:17:58 +05:30
Saqib Ansari
f1091534cd fix: [pos] minor bugs 2020-08-10 14:45:58 +05:30
Afshan
1f3cc7553c fix: grand_total assigment before reference 2020-08-07 15:57:31 +05:30
Rucha Mahabal
8118dd9e62 fix: escape company field 2020-08-07 14:52:50 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts 2020-08-06 15:09:22 +02:00
Deepesh Garg
44d62ad0d7
Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref
fix: condition for checking reference details for Payment Entry
2020-08-05 23:16:14 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913)
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Rucha Mahabal
5da067b689 fix: condition for checking reference detail for Payment Entry 2020-08-05 18:18:57 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice (#22882) 2020-08-03 20:42:15 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports (#22888) 2020-08-03 20:41:25 +05:30
Nabin Hait
48163e31c5
Dunning cleanup (#22898)
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
2020-08-03 20:38:28 +05:30
Rucha Mahabal
b50b20458e
fix: TypeError while concatenating account number and name in COA (#22885)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-08-03 15:51:57 +05:30
Deepesh Garg
2f2de2264d
Merge pull request #22887 from deepeshgarg007/subscription_test
fix: Test case for subscription
2020-08-03 14:31:21 +05:30
Deepesh Garg
5572f8eb1e fix: Test case for subscription 2020-08-03 13:40:11 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings (#22873) 2020-08-03 09:33:31 +05:30
Deepesh Garg
01e0d50eba
Merge pull request #22854 from nabinhait/gl-balance-fix
fix: Ignore cancelled gl entries to get account balance
2020-07-30 22:15:23 +05:30
Nabin Hait
9837285bf1 fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:52:20 +05:30
Marica
c1e46d8131
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-28 12:29:47 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items (#22648)
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test
2020-07-28 08:49:44 +05:30
Anupam K
8718daa11e Adding formatter in budget variance report 2020-07-25 23:56:11 +05:30
Deepesh Garg
c591b77613
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-24 19:04:05 +05:30
Mangesh-Khairnar
8721530b4b
fix(payment-request): do not set guest as administrator (#22801) 2020-07-24 17:19:56 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report (#22616)
* fix: buying price for non stock item in gross profit report

* fix: refactor query
2020-07-24 09:49:17 +05:30
Nabin Hait
39969647ca
fix: Added missing project field in Purchase invoice (#22799) 2020-07-24 09:48:54 +05:30
Deepesh Garg
9843e9f917
fix: Expnese claim outstanding while making payment entry (#22735) 2020-07-23 20:58:57 +05:30
Deepesh Garg
76028cde6a
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-23 19:05:17 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732)
* new parent updating logic, made requested changes

* fix: Increase Length of In Words fields

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 19:01:31 +05:30
Saqib
a6f98d48bc
refactor: POS workflow (#20789)
* refactor: add pos invoice doctype replacing sales invoice in POS

* refactor: move pos.py to pos invoice

* feat: add pos invoice merge log doctype

* feat: ability to merge pos invoices into a sales invoice

* feat: [wip] new ui for point of sale

* fix: pos.py moved to pos_invoice

* feat: loyalty points for POS Invoice

* fix: loyalty points on merging

* feat: return against pos invoices

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: status fix and set warehouse from pos profile

* fix: naming series

* feat: merge pos returns into credit notes

* feat: add pos list action for merging into sales invoices

* feat[UX]: add shortcuts & focus on search after customer selection

* feat: stock validation from previous pos transactions

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: fix df not found for base_amount precision

* feat: serial no validation from previous pos transactions

* chore: move pos.py into pos page

* feat: pos opening voucher

* feat: link pos closing voucher with opening voucher

* chore: use map_doc instead of get_mapped_doc for better perf

* feat: enforce opening voucher on pos page

* feat: [ui] [wip] point of sale beta ui refactor

* fix: auto fetching serial nos with batch no

* feat: [ui] item details section for new pos ui

* feat: remove item from cart

* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids

* fix: search from item selector

* feat: loyalty points as payment method

* feat: pos invoice status
* fix a bug with invalid JSON

* fix: loyalty program ui fixes

* feat: past order list and past order summary

* feat: (minor) setting discount from item details

* fix: adding item before customer selection

* feat: post order submission summary
* save and open draft orders
* fix: item group filter

* fix:  item_det not defined while submitting sle

* fix: minor bugs

* fix: minor ux fixes

* feat: show opening time in pos ui

* feat: item and customer images

* feat: emailing and printing an invoice

* fix: item details field edit shows empty alert

* fix: (minor) ux fixes

* chore: rename pos opening voucher to pos opening entry

* chore: (minor) rename pos closing voucher and sub doctypes

* chore: add patch for renaming pos closing doctypes

* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation

* fix: invoices not getting fetched on pos closing

* fix: indentation

* feat: view / edit customer info

* fix: minor bugs

* fix: minor bug

* fix: patch

* fix: minor ux issues

* fix: remove uppercase status

* refactor: pos closing payment reconciliation

* fix: move pos invoice print formats to pos invoice doctype

* fix: ui issues

* feat: new child doctype to store pos payment mode details

* fix: add to patches.txt

* feat: search by serial no

* chore: [wip] code cleanup

* fix: item not selectable from cart

* chore: [wip] code cleanup

* fix: minor issues
* loyalty points transactions
* default payment mode

* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI

* chore: pos invoice merge log tests

* fix: batch / serial validation in pos ui and on submission

* feat: use onscan js for barcode scan events

* fix: cart header with amount column

* fix: validate batch no and qty in pos transactions

* chore: do not fetch closing balances as opening balance

* feat: show available qty in item selector

* feat: shortcuts

* fix: onscan.js not found

* fix: onscan.js not found

* fix: cannot return partial items

* fix: neagtive stock indicator

* feat: invoice discount

* fix: change available stock on warehouse change

* chore: cleanup code

* fix: pos profile payment method table

* feat: adding same item with different uom

* fix: loyalty points deleted after consolidation

* fix: enter loyalty amount instead of loyalty points

* chore: return print format

* feat: custom fields in pos view

* chore: pos invoice test

* chore: remove offline pos

* fix: cyclic dependency

* fix: cyclic dependency

* patch: remove pos page and order fixes

* chore: little fixes

* fix: patch perf and plural naming

* chore: tidy up pos invoice validation

* chore: move pos closing to accounts

* fix: move pos doctypes to accounts

* fix: move pos doctypes to accounts

* fix: item description in cart

* fix: item description in cart

* chore: loyalty tests
* minor fixes

* chore: rename point of sale beta to point of sale

* chore: reset past order summary on filter change

* chore: add point of sale to accounting desk

* fix: payment reconciliation table in pos closing

* fix: travis

* Update accounting.json

* fix: test cases

* fix: tests
* patch loyalty point entries

* fix: remove test
* default mode of payment is mandatory for pos transaction

* chore: remove unused checks from pos profile

* fix: loyalty point entry patch

* fix: numpad reset and patches

* fix: minor bugs

* fix: travis

* fix: travis

* fix: travis

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30
KanchanChauhan
2826fd3c20
feat: Dunning (#22559)
* feat: Dunning

* fix: Replaces spaces with tab

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 15:45:03 +05:30
Deepesh Garg
7ac4ad8410
fix: Error due to comma in Pricing rule name (#22741)
* fix: Error due to commma in Pricing rule name

* fix: Remove print statement

* fix: Tests

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:12:55 +05:30
Deepesh Garg
9c49f2d886
feat: Enhancement in subscription (#22263)
* feat: Add supplier in subscription doctype

* fix: Code cleanup

* fix: Add dynamic link in subscription invoices

* fix: Multiple enhanccement in subscription

* feat: Follow calendar months in subscription

* fix: Test Cases and patch

* fix: Patch

* fix: Update patch and add fixes

* fix: Update permission for subscription settings

* fix: Patch and Test

* fix: Add cost center dimension in Subscripiton
2020-07-23 11:11:23 +05:30
Deepesh Garg
7c50f421e1
fix: Move branch code back to bank account (#22725)
* fix: Move branch code back to bank account

* fix: Patch
2020-07-22 18:21:04 +05:30
Deepesh Garg
c7eadfceb0
fix: Multi currency payment reconciliation (#22738)
* fix: Multi currency payment reconciliation

* fix: Hide currency link fields
2020-07-22 17:59:37 +05:30
Rucha Mahabal
1fddc6d126
chore: Exported Accounts Module Dashboard (#22769)
* chore: Exported Accounts Module Dashboards

* chore: deleted dashboard fixtures for Accounts module
2020-07-22 16:11:06 +05:30
Nabin Hait
493b581862 fix: Ignore cancelled entries in trial balance opening 2020-07-21 12:47:16 +05:30
Deepesh Garg
d81372a39c
Merge pull request #22734 from deepeshgarg007/custom_cash_flow
fix: Period list api changes for custom cash flow report
2020-07-18 20:35:28 +05:30
Deepesh Garg
07f8e749be fix: Period list api changes for custom cash flow report 2020-07-18 19:47:33 +05:30
Rucha Mahabal
6b3110ed13
Merge branch 'develop' into expense-claim-payment-fix 2020-07-16 12:23:26 +05:30
Anurag Mishra
50902cf30c Fix: Changes Requested 2020-07-16 12:21:46 +05:30
Suraj Shetty
11b0554ae9
Merge branch 'develop' into fix-financial-statement-print-format 2020-07-16 09:45:26 +05:30
Rohit Waghchaure
e0de0ac617 fix: not able to submit sales invoice 2020-07-15 17:13:43 +05:30
Suraj Shetty
34617744e1 fix: Show total row in print format of financial statement 2020-07-15 16:37:21 +05:30
Deepesh Garg
5beac7a0cc
fix: Period list fixes in financial statements (#22677) 2020-07-15 12:17:43 +05:30
Anurag Mishra
c1636f8fab fix: conversion rate as 1 if no conversion rate 2020-07-14 18:58:02 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
rohitwaghchaure
62fe2cac19
Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts
fix: Project link not set in accounts other than profit and loss accounts
2020-07-13 18:09:41 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Deepesh Garg
62d047bf9b
Merge branch 'develop' into payment_reco_cost_center_fix 2020-07-11 21:05:32 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test
fix(travis): Item Tax template test
2020-07-11 21:04:31 +05:30
marination
a6c10b1bc0 fix: Pricing Rule breaks if no item_code 2020-07-10 20:09:58 +05:30
Deepesh Garg
e99091fd4f
Merge pull request #22644 from deepeshgarg007/dcc_query
fix: Distributed cost center query
2020-07-10 13:35:34 +05:30
Deepesh Garg
7cb195b304 fix: Distributed cost center query 2020-07-10 13:33:50 +05:30
Afshan
fd28f1071e
style: arrangements of filters for reports (#22636) 2020-07-10 11:25:39 +05:30
Deepesh Garg
b74077faf5 fix(travis): Item Tax tempate template test 2020-07-09 19:50:41 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580)
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:25:51 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
rohitwaghchaure
37d828eda6
Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation
fix: Do not ignore validate methods on GL entry submit
2020-07-08 13:06:47 +05:30
Deepesh Garg
9071a7de82 fix: Add default cost center in payment reconciliation JV 2020-07-08 11:27:25 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop
fix: Item Tax Template permissions as per company
2020-07-08 10:08:53 +05:30
Marica
f4d0a3e7b0
Merge branch 'develop' into whitelist-query 2020-07-07 15:42:42 +05:30
rohitwaghchaure
546cfdaac2
Merge pull request #22601 from deepeshgarg007/payment_reco_company
fix: Payment reco error in multi-company setup
2020-07-07 15:32:36 +05:30
Deepesh Garg
ca351e3549 fix: Pass company 2020-07-07 14:37:17 +05:30
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