Commit Graph

4116 Commits

Author SHA1 Message Date
Rohit Waghchaure
88e0a64df2 added test cases 2020-11-05 20:07:27 +05:30
Rohit Waghchaure
2fe3b1807f fix: multiple pricing rules are not working on selling side 2020-11-05 20:07:19 +05:30
Abhishek Balam
5db99e0649 fix: code improvement, match error type for message 2020-11-04 23:43:11 +05:30
Abhishek Balam
5fe3abcfae fix: sales person without customer link throwing keyerror 2020-11-04 23:23:34 +05:30
Rucha Mahabal
dd7f4df669
fix: Budget test cases (#23822) 2020-11-04 21:59:08 +05:30
Rucha Mahabal
1636383120
fix: subscription test case
Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-30 00:09:55 +05:30
Saqib
825d79b31b
fix: pos profile has no attr 'show_only_available_items' (#23759) 2020-10-29 13:23:59 +05:30
Deepesh Garg
2004f64bcd
Merge pull request #23755 from deepeshgarg007/accounting_dimension_gl_fix_v13
fix: Do not allow Company as accounting dimension
2020-10-29 11:58:19 +05:30
Deepesh Garg
0dcb5887f3 fix: Do not allow Company as accounting dimension 2020-10-29 11:54:14 +05:30
Saqib
34873bf26b
fix: multiple pos issues (#23725)
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis
2020-10-26 13:24:47 +05:30
Nabin Hait
da301b0b7a fix: merge conflict 2020-10-25 13:07:59 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration
feat: M-pesa integration
2020-10-23 19:35:52 +05:30
Saqib
b4448114cf
feat: opening invoice creation tool with background jobs (#23595)
* feat: opening invoice creation tool with background jobs

* fix: tests

* fix: codacy

* fix: sider

* fix: codacy

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:32:37 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings (#23612)
* fix(Stock Settings): Type/Grammatical fixes in Settings

* fix: grammatical fixes in manufacturing settings

* fix: typo fix in accounting settings

* fix: typo fixes in HR settings

* fix: typo fixes in buying settings

* fix: typo fixes in Selling Settings

* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Update accounts_settings.json

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Mangesh-Khairnar
675f79920e fix: consider the existing paid payment request for phone payment channel 2020-10-23 15:41:05 +05:30
Mangesh-Khairnar
e03a02d9c0 fix: show descriptive message for missing fields 2020-10-23 13:38:55 +05:30
marination
efcc489967 fix: Cashier Closing Type Issue 2020-10-23 11:55:03 +05:30
Mangesh-Khairnar
1a6d82a447 fix(payment-request): only consider paid transactions 2020-10-22 01:07:49 +05:30
Mangesh-Khairnar
5c29eb08c4 Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6 fix(payment gateway account): add patch to set the payment channel as email 2020-10-19 18:27:40 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults (#23415)
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date

The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
	before_load(frm) {
	    var posting_date = $("input[data-fieldname='posting_date']")[0].value
	    posting_date = moment(posting_date)._d
	    frm.set_value('posting_date', posting_date )
	}
})
```

Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-19 17:02:04 +05:30
Rucha Mahabal
c3b1aef9f9
fix(minor): msgprint not defined in POS Invoice (#23680)
* fix(minor): msgprint not defined in POS Invoice

* fix: translation friendly syntax
2020-10-18 19:28:26 +05:30
Marica
569e218aa0
Merge pull request #23666 from marination/payment-reco-mandatory-check
fix: Payment Reconciliation client side validations
2020-10-16 18:06:16 +05:30
rohitwaghchaure
6646c524e6
Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop
refactor: enabled no copy property for Supplier Invoice Date to due date validation
2020-10-16 16:45:56 +05:30
marination
b14ffc4349 fix: Missing semicolon 2020-10-16 16:04:56 +05:30
Rohit Waghchaure
3cdaa92582 refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation 2020-10-16 15:26:27 +05:30
marination
e9b04dc727 fix: Payment Reconciliation client side validations 2020-10-16 12:36:13 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json (#23644)
added descriptions to fields to clarify input.
2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e fix: Do not get cancelled vouchers in Payment Reconciliation 2020-10-14 21:47:43 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts (#23530)
* fix: Chart of Accounts

* fix: Chart of Accounts with lower case "of"

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-14 10:29:53 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns (#23609)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-13 21:23:26 +05:30
Mangesh-Khairnar
51228b5ee3 fix: make response handling more descriptive 2020-10-13 17:10:16 +05:30
Marica
c5e139a542
fix: Travis (#23606)
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places

* fix: Item Barcode and Test

* fix: Over Receipt on subcontracting test

* fix: POS Invoice and Loyalty Program Tests

* fix: POS serialized item test and subcontracting exploded items in PO

* fix: Subcontracting test considering sourced_by_supplier items

* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
Anupam Kumar
71c02a6e89
Merge branch 'develop' into subscription-invoice-issue 2020-10-12 19:41:31 +05:30
Raffael Meyer
0975b961f9
Merge branch 'develop' into validate_regional_germany 2020-10-12 15:08:58 +02:00
Saqib
3daad224ad
fix: cannot merge pos invoice if validate selling price is checked (#23593)
* fix: cannot merge pos invoice if validate selling price is checked

* fix: validate selling price

* fix: test

* chore: add test

* fix: error message
2020-10-12 18:31:23 +05:30
Saqib
b332c5f06f
fix: sales invoice series gets overwritten with pos invoice series (#23479)
* fix: sales invoice series gets overwritten with pos invoice series

* chore: show is consolidated only if sales invoice is pos
2020-10-12 17:10:37 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set (#23580)
* Never add an asset GL entry if CWIP is not enabled

* fix: asset purchase with purchase invoice

* chore: allow enable cwip accounting only if cwip account is set

* fix: cannot create asset if cwip disabled and account not set

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff
fix: Do not consider opening entries for TDS calculation (#23597) 2020-10-12 12:39:08 +05:30
Anupam
efc3e1fa62 fix: Payment Schedule not fetching 2020-10-12 12:15:49 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv
fix: Opening Journal Entry via Data Import
2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team
fix: Change name of Sales Team table
2020-10-10 12:14:00 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view
fix: Check if list view standard filter exists in Payment Entry
2020-10-10 11:09:31 +05:30
Deepesh Garg
2676f96203 fix: Opening Journal Entry via Data Import 2020-10-09 21:58:38 +05:30
marination
07731c7735 fix: Check if list view standard filter exists in Payment Entry 2020-10-09 21:44:23 +05:30
Saqib Ansari
d927c8efba fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard 2020-10-09 21:00:33 +05:30
michellealva
1bc7fc41a5 fix: Change name of Sales Team table 2020-10-09 16:01:13 +05:30
Deepesh Garg
c837b5f48c
Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition
feat(Accounts): Add Condition Field In Pricing Rule
2020-10-08 16:32:21 +05:30
Abhishek Balam
6d1af84fef
Merge branch 'develop' into budget 2020-10-08 16:23:36 +05:30