Marica
3ad9393ff8
fix: SO to PO flow improvement ( #23357 )
...
* fix: SO to PO flow improvement
* fix: Dont map shipping_address
- shipping_address is a text field in SO and link field in PO
- Drop shipping case handles its mapping
- normal case doesnt need to map
* fix: Hide/Add rows depending on Against Default Supplier
* fix: Removed Default Supplier Select field from popup
- removed Default Supplier Select field from popup
- only loop through suppliers of selected items if via default supplier
- only check for items in selected items
* fix: Sales Order Drop Shipping Test
* fix: (translation)Multi line to single line strings
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:40:55 +05:30
Marica
0bd576aa44
fix: RFQ UX fixes ( #23382 )
...
* chore: RFQ UX fixes
* fix: RFQ to SUpplier Quotation Dialog
* fix: Remove 'No Quote' functionality
- No Quote in Suppliers table is removed
- It's use everywhere has been removed too (tests, server side files, DOM event)
* chore: More Info section and Project field
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:38:30 +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
Marica
758a68da35
fix: Sequence Matcher shouldn't get None input ( #23539 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:26:43 +05:30
Deepesh Garg
2b3f8e0c3b
fix: Cancel repayment accrual interest entry on payment cancellation
2020-10-23 19:02:24 +05:30
Rucha Mahabal
b01334d2e1
fix: attendance cannot be marked outside of Academic Year validation
2020-10-23 18:32:33 +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
rohitwaghchaure
93bbc52a68
feat: added sequence id in routing for the completion of operations sequentially ( #23641 )
...
* feat: added sequence id in routing for the completion of operations sequentially
* fix: translation syntax
2020-10-23 18:18:03 +05:30
Marica
9d94f785e9
fix: Hide Ex-Employees from Employee Tree and minor message UX ( #23711 )
...
* fix: Hide Ex-Employees from Employee Tree and minor message UX
* fix: translation syntax
2020-10-23 18:15:55 +05:30
Rucha Mahabal
8b4d33474e
fix: validation for attendance marked on future dates
2020-10-23 16:23:30 +05:30
Rucha Mahabal
6c3efbdb48
fix: filters for course and academic term fields
2020-10-23 16:11:40 +05:30
rohitwaghchaure
4eb87ea8e2
Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue
...
fix: incorrect backflush qty in manufacture entry
2020-10-23 15:43:43 +05:30
Mangesh-Khairnar
675f79920e
fix: consider the existing paid payment request for phone payment channel
2020-10-23 15:41:05 +05:30
Rohit Waghchaure
558879fad7
fix: Translation Syntax
2020-10-23 13:42:51 +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
Deepesh Garg
ca6cb6433c
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove
2020-10-22 21:52:16 +05:30
Deepesh Garg
cd2c90451e
fix: Unaccrued interest after disbursal
2020-10-22 21:50:06 +05:30
Nabin Hait
f30c389e4d
Merge branch 'develop' into naming-series-proj
2020-10-22 21:46:13 +05:30
Nabin Hait
db474aea95
Merge branch 'develop' into link-to-mr
2020-10-22 21:45:07 +05:30
Nabin Hait
ed1553ea81
Merge branch 'develop' into mpesa-integration
2020-10-22 21:45:03 +05:30
Nabin Hait
c77ce99ce8
Merge branch 'develop' into UAE-VAT-Format
2020-10-22 21:44:55 +05:30
Nabin Hait
5778595d50
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-22 21:42:54 +05:30
Nabin Hait
9ff4a2ebd8
Merge branch 'develop' into feat-added-balance-serial-no-column-develop
2020-10-22 21:40:29 +05:30
prssanna
13c6e2f320
feat: contextual setting for print uom after quantity
2020-10-22 17:19:00 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items ( #23702 )
...
* fix: Add Taxes if missing via Update Items
* chore: PO Test for adding tax row via Update Items
* chore: SO Test for adding tax row via Update Items
2020-10-22 17:04:31 +05:30
rohitwaghchaure
e3ad5f0bc3
Merge pull request #23407 from deepeshgarg007/stock_entry_conversion_factor
...
fix: Conversion factor fixes in Stock Entry
2020-10-22 16:58:06 +05:30
Saqib
a6ff664386
fix: cannot auto unlink payments for credit/debit notes ( #23689 )
2020-10-22 16:30:57 +05:30
prssanna
d7b704c90f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-22 15:39:47 +05:30
prssanna
b57b3c9f6c
feat: hook to fetch additional print settings in print view
2020-10-22 15:37:47 +05:30
rohitwaghchaure
cc5171a324
Merge branch 'develop' into stock_entry_conversion_factor
2020-10-22 15:20:32 +05:30
Saqib
52435ee291
Merge branch 'develop' into UAE-VAT-Format
2020-10-22 14:16:28 +05:30
Suraj Shetty
6a0eb61af3
fix: Set customer only if contact is present ( #23704 )
2020-10-22 14:05:58 +05:30
Rohit Waghchaure
fa842e8774
fix: incorrect backflush qty in manufacture entry
2020-10-22 13:35:27 +05:30
Michelle Alva
52514a30d7
feat: Add Integrations Settings in desk ( #22857 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-10-22 09:52:34 +05:30
Deepesh Garg
2c97244bad
fix: Test Cases
2020-10-22 09:34:27 +05:30
Mangesh-Khairnar
1a6d82a447
fix(payment-request): only consider paid transactions
2020-10-22 01:07:49 +05:30
Deepesh Garg
3f177bffac
fix: Add test for loan top up
2020-10-21 22:15:18 +05:30
Deepesh Garg
8f9bab79a7
fix: Update no copy fields
2020-10-21 19:03:13 +05:30
Deepesh Garg
13cbda110d
fix: Test Case
2020-10-21 16:11:52 +05:30
Mangesh-Khairnar
c8a04fec35
fix(mpesa-settings): add test cases to verify transactions
2020-10-21 14:07:00 +05:30
Shivam Mishra
5e00ed926c
feat: update icons
2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Deepesh Garg
2f65ab5355
fix: Validatiion for loan write off amountt
2020-10-21 10:40:59 +05:30
Saqib
4970386990
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 18:38:44 +05:30
Mohammad Hasnain
8796567b42
chore(UAE VAT 201): add puctuation
2020-10-20 16:35:28 +05:30
Deepesh Garg
ce95bc2ce0
Merge pull request #23691 from nextchamp-saqib/fix-#214
...
fix: '>' not supported between instances of 'str' and 'int'
2020-10-20 14:17:55 +05:30
Mohammad Hasnain
33e9a1ab31
refactor(UAE VAT 201): solve linting issues
2020-10-20 13:04:38 +05:30
Saqib Ansari
903055b7b6
fix: '>' not supported between instances of 'str' and 'int'
2020-10-20 11:59:06 +05:30
Mohammad Hasnain
6a24da4efd
refactor(UAE VAT 201): break functions
2020-10-20 11:53:06 +05:30
Rohit Waghchaure
09572f10f8
fix: overproduction, not allowed to transfer extra materials
2020-10-20 11:01:36 +05:30
Mohammad Hasnain
c08591124c
chore(UAE VAT 21): solve merge conflicts
2020-10-20 10:17:48 +05:30
Rohit Waghchaure
6471912216
fix: not able to do overproduction
2020-10-20 10:02:01 +05:30
Mohammad Hasnain
75ccb62d46
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 09:40:44 +05:30
Mohammad Hasnain
78ec254da4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-10-20 09:39:01 +05:30
Mohammad Hasnain
234036df32
chore(uae vat 201): solve travis issues
2020-10-20 07:42:10 +05:30
Mohammad Hasnain
853fd03f49
feat(uae vat 201): fix linter issues
2020-10-19 22:35:16 +05:30
Mohammad Hasnain
33cdfdfb7f
feat(UAE VAT 201): Add tests for report
2020-10-19 20:48:43 +05:30
Mohammad Hasnain
c1b8004757
feat(UAE VAT 21): claimable to recoverable
2020-10-19 20:47:56 +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
Mohammad Hasnain
32eb9a7893
feat(UAE VAT 201): claimable to recoverable
2020-10-19 17:58:50 +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
174019a838
fix: Student Admission and Student Applicant fixes ( #23515 )
...
* fix: student admission list portal styling
* fix: added basic validations to Student Admission DocType
* fix: show program description and apply button for every program
* fix: don't show apply now button if admissions have not started
* fix: fetch admission details in student applicant web form
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 17:00:56 +05:30
Deepesh Garg
8859b71956
fix: Check for backdated validation only for transaction company ( #23639 )
...
* fix: Check SLE only for transaction company
* fix: Add tests
* fix: Move backdated entry validation from transaction base to stock ledger entry
* chore: Add tests
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:56:45 +05:30
Afshan
e0cb6c3b9d
fix: removed extra space from label "Rate" ( #23683 )
2020-10-19 16:55:20 +05:30
rohitwaghchaure
3a17147a32
refactor: book loss amount in the COGS instead of stock received but not billed ( #23671 )
2020-10-19 16:54:11 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search ( #23629 )
...
* fix(Bank Reconciliation): update/merge CR/DR journal entry search
Prior to this commit, the debit journal entry search (for
credit-side Bank Transaction entries) and the corresponding
credit journal entry search had diverged, with the latter
working but the former not working. Thus, the search for
journal entries matching a credit Bank Transaction (for the
purposes of reconciliation) was never returning any matching
journal entries, making reconciliation difficult.
To fix this, this commit not only updates the debit journal
entry search, but takes advantage of the fact that the two SQL
queries for the two sides (debit/credit) differ only by the
word "debit" or "credit," to merge the code for the two
queries, making the code more DRY and hopefully reducing the
chance of similar bugs occurring in the future.
* fix: message translation
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:49:55 +05:30
Shivam Mishra
2c2e7297ae
feat: update accounts onboarding
2020-10-19 14:44:02 +05:30
Shivam Mishra
8261df29c4
feat: update splash logo
2020-10-19 13:52:35 +05:30
Saqib
896a0cc1f7
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-19 11:55:12 +05:30
rohitwaghchaure
2fbeb7c1dd
refactor: added new filters in the Batch-wise balance history report ( #23676 )
...
* refactor: added new filters in the Batch-wise balance history report
* fix: added semicolon
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 11:37:54 +05:30
Frappe PR Bot
083f3fd981
chore: Update translations ( #23677 )
...
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 11:19:27 +05:30
Rucha Mahabal
96bd65e203
fix: duplicate validation for Course Enrollment ( #23659 )
...
* fix: duplicate validation for Course Enrollment
* fix: clean-up failing tests
2020-10-19 10:41:25 +05:30
rohitwaghchaure
5d6686bd8c
Fixed stock ageing report data develop ( #23673 )
...
* fix: stock ageing report
* Update stock_ageing.py
2020-10-19 10:39:20 +05:30
rohitwaghchaure
21bf5e9b8e
Fixed incorrect operation time calculation develop ( #23674 )
...
* fix: incorrect operation time calculation for batch size
* Update test_work_order.py
2020-10-19 10:38:48 +05:30
Deepesh Garg
8cd8dbe15d
fix: Add write off test
2020-10-18 22:26:09 +05:30
Deepesh Garg
9945ccc0cc
fix: Write Off amount handling in Loan accrual and closure
2020-10-18 22:25:24 +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
Deepesh Garg
c0e24735e3
feat: Add loan write off doctype
2020-10-17 22:31:36 +05:30
Faris Ansari
c6f4e84a45
Merge pull request #23640 from abhishekbalam/address_customisation
2020-10-16 18:21:09 +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
Rohit Waghchaure
e6a29cc33a
fix: performance issue while adding template item in the cart
2020-10-16 17:59:54 +05:30
Rohit Waghchaure
76fafe8842
feat: balance serial nos in stock leder report
2020-10-16 17:58:54 +05:30
Rohit Waghchaure
c70cc0d950
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-10-16 17:43:36 +05:30
rohitwaghchaure
e30397bf2e
Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop
...
fix: production plan incorrect work order qty (#23264 )
2020-10-16 17:41:25 +05:30
Deepesh Garg
eb3983ec6c
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove
2020-10-16 17:31:38 +05:30
Marica
ca5ad076d5
Merge branch 'develop' into link-to-mr
2020-10-16 16:49:38 +05:30
marination
359778e235
chore: Code cleanup, reduce redundancy
2020-10-16 16:47:23 +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
rohitwaghchaure
4eaa74c4f5
Merge pull request #23669 from rohitwaghchaure/not-able-to-make-material-request-from-so-develop
...
fix: not able to make material request from SO
2020-10-16 16:43:45 +05:30
Marica
3f7333af7f
Merge branch 'develop' into payment-reco-mandatory-check
2020-10-16 16:03:59 +05:30
marination
b14ffc4349
fix: Missing semicolon
2020-10-16 16:04:56 +05:30
Faris Ansari
be0fcbea68
fix: Dont add Contact link if is company address
2020-10-16 15:55:25 +05:30
Faris Ansari
22bcad9dc7
fix: Cleanup code
2020-10-16 15:28:12 +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
Rohit Waghchaure
2ce67b0ef9
fix: not able to make material request from SO
2020-10-16 15:21:52 +05:30
rohitwaghchaure
f01856d7a9
fix: production plan incorrect work order qty ( #23264 )
...
* fix: production plan incorrect work order qty
* added test case
* Update test_production_plan.py
2020-10-16 15:19:23 +05:30
Shivam Mishra
5418818683
feat: add tour for account settings
2020-10-16 14:24:22 +05:30
marination
e9b04dc727
fix: Payment Reconciliation client side validations
2020-10-16 12:36:13 +05:30
Saqib
2f71927af8
fix: fuel expense amount of vehicle log ( #23632 )
...
* fix: fuel expense amount of vehicle log
* fix: undefined var employee_id in test
* fix: test
2020-10-16 12:32:59 +05:30
Mangesh-Khairnar
c66fce4965
fix: reload current pos doc after updating the information via callback
2020-10-16 12:03:08 +05:30
Mangesh-Khairnar
cab5d22ef5
fix: add a realtime publish to refresh the dashboard content
2020-10-16 11:38:07 +05:30
prssanna
5ee7bca185
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-16 11:32:10 +05:30
prssanna
12d4be7f3f
feat: icons in leaderboard
2020-10-16 11:31:47 +05:30
Saqib Ansari
de505631a6
fix: codacy
2020-10-16 11:30:34 +05:30
Saqib Ansari
1dec68e8e4
fix: transalation syntax
2020-10-16 10:47:29 +05:30
Deepesh Garg
775e689ba9
fix: Add tests
2020-10-15 22:09:05 +05:30
Deepesh Garg
01a7297f69
Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor
2020-10-15 17:13:29 +05:30
Rohit Waghchaure
5f465394a7
fix: serial no field is blank in stock reconciliation
2020-10-15 15:56:50 +05:30
rohitwaghchaure
79c1c4e3fb
Merge pull request #23398 from anupamvs/quality-procedure-v13
...
fix: quality procedure parent
2020-10-15 15:52:22 +05:30
Shivam Mishra
cb8457b9ae
feat: add description to Accounts onboarding
2020-10-15 13:53:12 +05:30
Abhishek Balam
349fcfd6a5
fix: set default filters on unchecking box, code cleanup
2020-10-15 12:21:43 +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
Abhishek Balam
89419c9a30
fix: move get_shipping_address() from frappe to erpnext and fix references
2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73
fix: gettext import and changed function order in address.py
2020-10-14 19:48:57 +05:30
Abhishek Balam
c0215d257c
Merge branch 'develop' into address_customisation
2020-10-14 19:33:16 +05:30
Abhishek Balam
6e9e7b4c7a
fix: serverside validation overrides
2020-10-14 19:31:37 +05:30
Abhishek Balam
38b26c8f3e
fix: added semicolons
2020-10-14 18:24:51 +05:30
rohitwaghchaure
f8ce64c0ca
Merge pull request #23443 from marination/rfq-email
...
feat: Supplier Email Preview in RFQ
2020-10-14 18:16:59 +05:30
Abhishek Balam
346ca568b7
fix: set company link in address when is_your_company_address is set
2020-10-14 18:11:04 +05:30
Mohammad Hasnain
b9dc13294d
chore(UAE VAT 201) solve translations issues
2020-10-14 16:56:26 +05:30
Nabin Hait
a2d6f254c5
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-14 16:34:56 +05:30
Afshan
9e08b21e0b
fix: removing unused imports ( #23633 )
2020-10-14 15:44:52 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction ( #23635 )
2020-10-14 15:44:30 +05:30
Marica
1cdb9b5b39
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-14 14:26:22 +05:30
marination
b5d16a82eb
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-10-14 14:05:54 +05:30
Mohammad Hasnain
dfc3993cec
chore(UAE VAT 21): rename report
2020-10-14 12:21:36 +05:30
Anupam
d8a002cd8e
Merge branch 'opportunity-status' of https://github.com/anupamvs/erpnext into opportunity-status
2020-10-14 11:48:42 +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
Anupam Kumar
31417864cb
fix: project value is missing from procurement-tracker ( #23549 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-14 10:29:25 +05:30
Frappe PR Bot
d8ddc321f8
chore: Update translations ( #23577 )
...
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-14 10:28:21 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d
Merge branch 'develop' into UAE-VAT-Format
2020-10-14 00:26:57 +05:30
rohitwaghchaure
cb791330f6
Merge branch 'develop' into quality-procedure-v13
2020-10-13 23:39:45 +05:30
Rucha Mahabal
f625da2b8b
Merge branch 'develop' into enrollment-fixes
2020-10-13 23:24:42 +05:30
rohitwaghchaure
4d93bfebd8
Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision
...
fix: setting user defined precision instead of 2
2020-10-13 22:46:02 +05:30
Rucha Mahabal
ff0917358c
fix: test
2020-10-13 22:39:05 +05:30
Saqib
639eea142f
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-13 21:42:22 +05:30
Deepesh Garg
8a7886ac60
Merge pull request #23621 from frappe/address_template_luxembourg
...
feat: add address template for luxembourg
2020-10-13 21:31:51 +05:30
Deepesh Garg
71a58a8fd0
Merge pull request #23605 from marination/item-link-formatter
...
fix: Item Link Formatter Behaviour
2020-10-13 21:26:00 +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
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy
...
fix: Fiscal Year and Tax Rates for Italy
2020-10-13 20:29:51 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
rohitwaghchaure
db0fefd92c
Merge pull request #23614 from aakvatech/patch-3
...
feat: Add company and correct filter in bank reconciliation statement
2020-10-13 19:59:31 +05:30
rohitwaghchaure
2a8a2215d0
Merge pull request #23620 from anupamvs/lead-address
...
fix: displaying mandatory address field in Lead form
2020-10-13 19:54:44 +05:30
Kenneth Sequeira
3eec4e61ab
fix: GST rates for Australia
2020-10-13 19:23:48 +05:30
Kenneth Sequeira
1b329aaa7b
fix: json format fixes
2020-10-13 19:10:09 +05:30
Afshan
c359d3528f
fix: setting user precision instead of default
2020-10-13 18:54:54 +05:30
Deepesh Garg
54c898708b
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove
2020-10-13 18:11:45 +05:30
Anupam Kumar
67a7279d1f
Merge branch 'develop' into opportunity-status
2020-10-13 18:11:23 +05:30
Anupam
73d944da21
fix: review changes
2020-10-13 18:11:05 +05:30
Deepesh Garg
66967c6d45
fix: Loan Security unpledge on loan cancel
2020-10-13 18:10:51 +05:30
Anupam
7db38058f3
fix: displayings mandatory address field in Lead form
2020-10-13 17:33:58 +05:30
Rucha Mahabal
fc8ced9958
Merge branch 'develop' into enrollment-fixes
2020-10-13 17:28:39 +05:30
Mangesh-Khairnar
51228b5ee3
fix: make response handling more descriptive
2020-10-13 17:10:16 +05:30
barredterra
9aa3e7a37d
feat: address template for luxembourg
2020-10-13 13:35:33 +02:00
Marica
43d3176d62
Merge branch 'develop' into patch-3
2020-10-13 17:01:18 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return
2020-10-13 16:57:11 +05:30
Marica
0ed3e947ba
Merge branch 'develop' into rfq-email
2020-10-13 16:55:25 +05:30
Marica
6f819d797b
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-13 16:54:39 +05:30
Marica
9cd79b6859
Merge branch 'develop' into item-link-formatter
2020-10-13 16:54:28 +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
3245eaaeb0
fix: displayings mandatory address field in Lead form
2020-10-13 15:35:10 +05:30
Marica
ae1c65cde7
Merge branch 'develop' into item-link-formatter
2020-10-13 15:05:53 +05:30
Anupam
528a75ae9b
fix: review changes
2020-10-13 11:46:52 +05:30
justmejust
ed779a416c
Update ar.csv ( #23490 )
...
these changes made to the file is critical and important for Arabic user of the this software .the changes made to make appropriate and more correct meaning fro example in the Blanket Orders from Costumers the previous translation meaning امر بطانية) ) which mean you have an order to get ta Blanket which used when you want to sleep.
so i decided to make this changes and will continue update this translation file in the future.
2020-10-13 11:46:02 +05:30
aakvatech
617892db20
feat: Add company and correct filter in bank statement reconciliation report filters
...
If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.
https://github.com/frappe/erpnext/issues/23613
2020-10-13 08:18:59 +03:00
Deepesh Garg
8c13fded17
fix: Add unaccrued interest in interest amount for loan closure
2020-10-13 09:23:04 +05:30
marination
5b790a0095
fix: Convert dates to datetime.date before comparing in Holiday List
2020-10-13 02:37:55 +05:30
Kenneth Sequeira
968f61d8ba
fix: add multiple VAT rates for Italy
2020-10-13 00:25:46 +05:30
Kenneth Sequeira
56d305b966
fix: update italy fiscal year
2020-10-13 00:07:52 +05:30
Marica
978e16481e
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-12 21:17:22 +05:30
marination
824f48fd23
fix: Item Link Formatter Behaviour
2020-10-12 20:08:03 +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
Marica
9cc05bb83e
Merge branch 'develop' into rfq-email
2020-10-12 18:02:15 +05:30
rohitwaghchaure
4164d08d17
Merge pull request #23323 from marination/supplier-quotn-comparison
...
feat: Supplier Quotation Comparison - v3
2020-10-12 17:55:15 +05:30
Marica
41067e204c
Merge branch 'develop' into print-uom-after-quantity-patch
2020-10-12 17:32:29 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue
2020-10-12 17:25:12 +05:30
Marica
14b9c79ddc
Merge branch 'develop' into supplier-quotation-ux
2020-10-12 17:16:28 +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
Saqib
ebb0a6266a
fix: last purchase rate in item prices report ( #23506 )
...
* fix: last purchase rate in item prices report
* fix: last purchase rate in item prices report
* fix: last purchase rate in item prices report
* chore: fetch last purchase rate from update stock purchase invoices
2020-10-12 17:09:09 +05:30
Saqib
ebbe285872
feat: (report) POS Register ( #23313 )
...
* feat: pos register report
* feat: group by fields in pos register
* chore: add paid amount column
* fix: (minor) remove redundant group by label
2020-10-12 17:02:31 +05:30
rohitwaghchaure
a060f8c00b
Merge pull request #23524 from michellealva/employee_exit
...
fix(Employee): Field level change in Exit section
2020-10-12 16:23:54 +05:30
rohitwaghchaure
14e7656a57
Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status
...
fix: Asset status after maintenance or repair
2020-10-12 16:13:29 +05:30
Marica
e9f0268d32
Merge branch 'develop' into item-attribute-validation-on-non-template-item
2020-10-12 15:26:34 +05:30
rohitwaghchaure
a57ad47cb8
Merge pull request #23538 from kennethsequeira/spellcheck
...
chore: spell fixes for Condition
2020-10-12 15:25:23 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux
2020-10-12 15:17:32 +05:30
rohitwaghchaure
4e59abf0bf
Merge pull request #23583 from anupamvs/item-price
...
fix: can't save item price after adding child table
2020-10-12 15:15:50 +05:30
Rushabh Mehta
2bef986f14
Merge pull request #23450 from michellealva/jc
...
fix: Change Error Message in Work Order
2020-10-12 15:07:21 +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
Kevin Chan
f6bcd5c2b2
test: Add test case for duplicate checking
2020-10-12 16:57:33 +08:00
Kevin Chan
58389ebd40
style: Collapse whitespace
2020-10-12 15:20:11 +08:00
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
marination
03975a692e
fix: Perform Item Attribute Value Validation on Variants Only
2020-10-12 12:03:07 +05:30
Kevin Chan
39bed3a65e
fix: Add null or empty checking to validation
...
This commit adds null or empty checking in the **Item Price** DocType's
`check_duplicates()`. This was done to fix a bug where some prices are
shown to be duplciates even though they aren't because they don't have
values in some fields.
2020-10-12 11:42:05 +08:00
Kevin Chan
a322f0d0b3
chore: Fix error message grammar
2020-10-12 11:38:55 +08:00
Kevin Chan
7a86a77322
fix: Asset status after maintenance or repair
...
Fix a bug where an **Asset**'s status is not being set to what it was
previously after an **Asset Repair** or **Asset Maintenance**.
2020-10-12 11:30:36 +08:00
Deepesh Garg
c9ebef4d30
Merge pull request #23567 from nextchamp-saqib/restrict-future-posting
...
chore: do not allow future transactions
2020-10-11 20:55:38 +05:30
Deepesh Garg
a034311b1b
fix: Acrual type
2020-10-11 20:52:02 +05:30
Anupam
2be23309bb
fix: can't add child table in item price
2020-10-11 14:14:50 +05:30
Mohammad Hasnain
ac451b3a54
feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice
2020-10-11 01:40:22 +05:30
Deepesh Garg
d86b7c5537
fix: Remove repayment type
2020-10-11 00:37:34 +05:30
Deepesh Garg
6dccf79250
fix: Add accrual type and penalty field in interest accrual
2020-10-10 23:32:57 +05:30
Deepesh Garg
6d27adccfc
fix: Button to close loan
2020-10-10 23:28:39 +05:30
Deepesh Garg
51c6cf692e
fix: Add method for loan closure
2020-10-10 23:20:36 +05:30
Mohammad Hasnain
fc2ace1a31
Merge branch 'develop' into UAE-VAT-Format
2020-10-10 22:06:06 +05:30
Mohammad Hasnain
72bcb56368
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-10-10 22:04:16 +05:30
Saqib Ansari
3d91d48b77
fix: validate only for stock transactions
2020-10-10 21:56:50 +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
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk
...
fix: Add lower deduction certificate in desk page
2020-10-10 11:23:26 +05:30
rohitwaghchaure
01e23264a6
Merge pull request #23557 from KanchanChauhan/issue#23475-2
...
feat: Supplier Sourced Items in BOM
2020-10-10 11:17:53 +05:30
rohitwaghchaure
5065f8ac83
Merge pull request #23545 from tundebabzy/develop
...
fix: pass self.flags.ignore_permissions to the ignore_permissions
2020-10-10 11:11:57 +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
rohitwaghchaure
9333a1dd54
Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix
...
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-10 11:08:37 +05:30
rohitwaghchaure
ea8ea4abb5
Merge pull request #23569 from marination/prod-order-reference-in-item
...
fix: Remove Production Order reference from Item Validation
2020-10-10 11:03:26 +05:30
Kanchan Chauhan
654c36ea99
feat: Supplier Sourced Items in BOM
2020-10-09 22:05:03 +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
56fea7d243
fix: update items after submission ignores precision ( #23491 )
...
* fix: update items after submission ignores precision
* chore: add test
2020-10-09 21:19:25 +05:30
Saqib Ansari
d927c8efba
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-09 21:00:33 +05:30
marination
bd6d5eb5ac
fix: Remove Production Order reference from Item Validation
2020-10-09 20:57:17 +05:30
michellealva
1bc7fc41a5
fix: Change name of Sales Team table
2020-10-09 16:01:13 +05:30
Saqib Ansari
776d8f72cf
chore: do not allow future transactions
2020-10-09 15:36:11 +05:30
Anupam
22dc42efb9
fix: error log while creating company
2020-10-09 14:58:39 +05:30
Tunde Akinyanmi
f2b12a3b9c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-10-09 07:20:19 +01:00
Rucha Mahabal
a6dc7833f6
Merge pull request #23537 from michellealva/missing_links
...
fix: Add links in Stock desk page
2020-10-09 11:46:14 +05:30
Deepesh Garg
5e6ea36938
fix: Add lower deduction certificate in desk page
2020-10-08 20:32:36 +05:30
marination
4be5b5c891
fix: Handle missing Account and Item in Opening Invoice Creation Tool
2020-10-08 19:51:42 +05:30
Rohit Waghchaure
a86cab0bb2
fix: added patch to make custom field 'Print UOM after Quantity'
2020-10-08 16:41:23 +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
Deepesh Garg
8242da6310
Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor
2020-10-08 16:23:34 +05:30
Saqib Ansari
3f28fb19aa
chore: validate is_group of child parent account before auto creating an account
2020-10-08 14:57:27 +05:30
rohitwaghchaure
242bae4a81
Merge pull request #23548 from michellealva/selling_links
...
fix(Selling): Add missing reports on desk
2020-10-08 11:24:46 +05:30
Saqib
22b4c86a38
fix: cannot merge pos invoices with inclusive tax ( #23541 )
...
* fix: cannot merge pos invoices with inclusive tax
* fix: item rate calculation
2020-10-08 11:23:21 +05:30
michellealva
38aee6e3cb
fix(Selling): Add missing reports on desk
2020-10-08 10:24:11 +05:30
Tunde Akinyanmi
4010196488
fix: pass self.flags.ignore_permissions to the ignore_permissions
...
argument of Address and Contact controller
2020-10-08 02:25:09 +01:00
Kenneth Sequeira
0b84a6399b
fix: remove default nationality as Indian
2020-10-07 23:14:27 +05:30
Kenneth Sequeira
be0ebc5085
spell fixes for Condition
2020-10-07 20:47:12 +05:30
Marica
71db253b86
Merge branch 'develop' into fix_title_customer_name
2020-10-07 20:27:32 +05:30
Abhishek Balam
ebf53a7f25
fix(HR): Appraisal form Enhancements ( #23500 )
...
* fix: remove total score button
* Removing conflicts
2020-10-07 19:59:26 +05:30
michellealva
3525ddabc5
fix: Add links in Stock desk page
2020-10-07 19:02:19 +05:30
barredterra
242579b77c
fix: use party name as title
2020-10-07 14:34:21 +02:00
michellealva
a9c2401a2d
fix: Typo in Accounts Setings
2020-10-07 15:13:57 +05:30
Abhishek Balam
937308854a
Merge branch 'develop' into pricing_rule_on_condition
2020-10-07 13:35:53 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany
2020-10-06 16:53:52 +02:00
michellealva
203585f292
fix(Employee): Field level change in Exit section
2020-10-06 16:00:39 +05:30
michellealva
2e425efae8
fix: blank option in the beginning
2020-10-06 15:15:29 +05:30
michellealva
a2aae5644e
fix(Budget): Change options in select field
2020-10-06 15:02:01 +05:30
Mangesh-Khairnar
faa0cce7a7
fix: pass mobile number to generate the stk push
2020-10-06 13:58:54 +05:30
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote
2020-10-06 13:27:28 +05:30
rohitwaghchaure
59ee417d31
Merge pull request #23483 from marination/item-attr
...
fix: Handle Blank from/to range in Numeric Item Attribute
2020-10-06 12:00:26 +05:30
Mangesh-Khairnar
862433febb
fix: create custom field for mpesa receipt
2020-10-06 10:59:59 +05:30
Mangesh-Khairnar
8d54d61c28
fix: handle payment completion via payment request
2020-10-05 22:37:31 +05:30
Sun Howwrongbum
72a596971c
fix: also update employee field when renamed ( #23482 )
2020-10-05 20:48:53 +05:30
Deepesh Garg
f58a5ec6a5
fix: Codition in batch selector query
2020-10-05 13:55:53 +05:30
rohitwaghchaure
96fadb7c9b
Merge pull request #23511 from marination/sales-order-project
...
fix: Show Project under Create button in SO
2020-10-05 13:17:48 +05:30
rohitwaghchaure
ad2dd6062e
Merge pull request #23513 from deepeshgarg007/batch_search
...
fix: Search batches based on search fields
2020-10-05 13:16:03 +05:30
Shivam Mishra
6a506b63bf
fix: variables path
2020-10-05 12:41:30 +05:30
Deepesh Garg
1fae7749be
fix: Search batches based on search fields
2020-10-05 12:38:54 +05:30
marination
e7af9ff999
fix: Show Project under Create button in SO
2020-10-05 12:24:43 +05:30
Saqib
2016a34e30
fix: naming series - cannot reset current value to zero ( #23504 )
2020-10-04 18:13:24 +05:30
Deepesh Garg
5bf35e465e
Merge pull request #23220 from marination/account-add-rename
...
feat: Validate and Update Child Company Accounts on Rename/Adding Account
2020-10-04 15:19:26 +05:30
Mangesh-Khairnar
1bef6a530c
fix: create payment entry against payment request
2020-10-04 13:01:11 +05:30
Deepesh Garg
f8bf139692
Merge pull request #23498 from aakvatech/patch-3
...
fix: get_outstanding_invoices not ignoring the cancelled transactions
2020-10-03 22:36:24 +05:30
aakvatech
38ccf82604
fix: get_outstanding_invoices not ignoring the cancelled transactions
...
Added is_cancelled=0 in 2 places for get_outstanding_invoices
2020-10-03 19:41:38 +03:00
Suraj Shetty
5dc0432cff
chore: Update translations
2020-10-03 08:52:07 +00:00
rohitwaghchaure
3c77a4697b
Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report
...
fix: currency symbol in profit and loss report
2020-10-03 10:32:00 +05:30
marination
c213cd96c5
fix: Handle Blank from/to range in Numeric Item Attribute
2020-10-02 12:22:28 +05:30
marination
0bc61b31f7
chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM
2020-10-02 11:54:54 +05:30
Suraj Shetty
70c06512d2
chore: Update translations
2020-10-02 03:57:15 +00:00
marination
b9e2f17f4f
fix: More secure query
2020-10-01 21:31:51 +05:30
marination
f57ba86bce
chore: Add Date and Valid Till to List View
2020-10-01 21:10:00 +05:30
marination
5006345a0a
chore: Fetch RFQs in Get Items from RFQ based on Supplier selected
...
- Rfq will appear only if selected supplier is in the RFQ
2020-10-01 20:41:05 +05:30
marination
4993ef19d6
feat: Supplier Quotation UX fixes
2020-10-01 16:35:09 +05:30
marination
29d7528a95
fix: Hide Preview Email button on submitted doc
2020-10-01 14:55:21 +05:30
Abhishek Balam
71c24c8a90
feat: add tests
2020-10-01 14:54:11 +05:30
marination
f90c3602a7
fix: Price should be total amount, modified deskpage
2020-10-01 14:38:17 +05:30
hasnain2808
f8db9582c3
feat(UAE VAT 21): Add currency formatting
2020-10-01 12:59:39 +05:30
hasnain2808
8cc6f2b388
feat(UAE VAT 21): add fixed width to columns
2020-10-01 12:44:39 +05:30
hasnain2808
10a3a338b6
refactor: change uae vat settingplural
2020-09-30 21:51:00 +05:30
Faris Ansari
db8764a520
Merge pull request #23201 from alyf-de/website_theme_scss
...
fix: style for website theme
2020-09-30 18:26:58 +05:30
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py
2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493
fix: currency symbol in profit and loss report
2020-09-30 17:44:35 +05:30
Shivam Mishra
1323a9a990
feat: set app name for ERPNext in install and patch
2020-09-30 16:33:14 +05:30
Deepesh Garg
287014a9a2
fix: Remove any taxes fetched due to unknown rules
2020-09-30 13:42:10 +05:30
Deepesh Garg
fc71e5b5b7
fix: Remove any taxes fetched due to unknown rules
2020-09-30 13:42:00 +05:30
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance
...
fix(Accounts): Add Currency filter in Trial Balance report
2020-09-30 13:16:16 +05:30
Marica
8fbd960f66
Merge branch 'develop' into update-items-perm
2020-09-30 12:51:35 +05:30
hasnain2808
3294f86b92
refactor: fix linting
2020-09-30 12:15:07 +05:30
Shivam Mishra
b04b53c613
Merge branch 'develop' into better-logging-for-membership
2020-09-30 12:01:54 +05:30
Shivam Mishra
86171a3fda
fix: translate error log
2020-09-30 12:01:35 +05:30
Shivam Mishra
3ec67077a9
chore: use .format for message
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-30 12:00:46 +05:30
Abhishek Balam
001e7e9df9
fix: remove default value
2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0
fix: add currency select to Trial Balance
2020-09-30 01:32:42 +05:30
Deepesh Garg
bc44bc64cc
fix: Add test
2020-09-29 18:39:45 +05:30
marination
661bf64bba
fix: Check only Read and Write Permission in Update Items
2020-09-29 18:16:45 +05:30
Deepesh Garg
2b38361ff5
Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote
2020-09-29 17:26:48 +05:30
Deepesh Garg
c33fbd7e52
Merge pull request #23416 from anupamvs/quotation-portal
...
feat: provision to draft quotation from portal
2020-09-29 17:08:05 +05:30
barredterra
81ad90c1d4
feat: validate sales invoice for germany
2020-09-29 11:54:57 +02:00
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename
2020-09-29 13:18:54 +05:30
Marica
3b610bd07d
Merge branch 'develop' into dialog-filters
2020-09-29 13:16:33 +05:30
michellealva
3aedeb642f
fix: Change Error Message in Work Order
2020-09-29 12:54:55 +05:30
marination
65fc48da25
fix: Email Template and Codacy
...
- Email Preview works well with email template
- Codacy for docstrings
2020-09-29 12:46:19 +05:30
Marica
e5a60f1cec
Merge branch 'develop' into rfq-email
2020-09-29 11:56:44 +05:30
Marica
818522bd45
Merge branch 'develop' into dialog-filters
2020-09-28 21:18:23 +05:30
marination
629fa57f9d
fix: Remove unneccessary div
2020-09-28 21:17:49 +05:30
marination
a6ea86432e
fix: Skip Update Password in Preview
...
- dont show update password button in preview, its for the suppliers mail only
- modified docstrings
- update supplier row contact only if None
2020-09-28 21:05:11 +05:30
hasnain2808
a5e8e449ee
chore: Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:43:03 +05:30
marination
f911228871
fix: UX and code cleanup
...
- Added a small note in muted text at bottom of Dialog
- Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway
- Renamed `update_contact_of_supplier` to `link_supplier_contact`
- On sending mail, new users and contacts that were created get updated in RFQ doc
- Added docstrings to functions
2020-09-28 20:21:44 +05:30
hasnain2808
23c8966e81
Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:06:02 +05:30
hasnain2808
2c62d946f5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-09-28 20:03:27 +05:30
Mangesh-Khairnar
8d12c3841f
fix: process transaction callback
2020-09-28 19:40:42 +05:30
hasnain2808
80068e16e8
Refactor(UAE VAT 21): Replace f-strings by format
2020-09-28 18:58:27 +05:30
Anupam
77cf53201a
feat: open lead status on next contact date
2020-09-28 18:38:41 +05:30
marination
056c86033d
fix: Reuse function to render email preview
...
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
2020-09-28 17:42:22 +05:30
madar2020
ce39323a0a
feat: Allow rich text edit for questions ( #23402 )
...
* rich text
* Update question.json
As to make sense for rich text
* Update quiz_question.json
* Update question.json
* Update quiz_question.json
* Update macros.html
fix: cards in second row of homepage section overlapps the row before.
* Revert "Update macros.html"
This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2.
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-28 17:36:25 +05:30
marination
bd36f2b94d
feat: Supplier Email Preview in RFQ
2020-09-28 15:59:03 +05:30
hasnain2808
587bb05a37
feat(UAE VAT 21): Add desk page for UAE VAT 21
2020-09-28 14:52:29 +05:30
hasnain2808
0860c74c82
feat(UAE VAT 21): Add permissions for doctypes
2020-09-28 14:38:45 +05:30
hasnain2808
2d30148940
feat(UAE VAT 21): Add vat settings
2020-09-28 14:38:14 +05:30
Raffael Meyer
21266fe4a4
Merge branch 'develop' into website_theme_scss
2020-09-28 10:15:55 +02:00
rohitwaghchaure
7b2f141d0d
Merge pull request #23441 from anupamvs/lead-contact-detail
...
fix: flushing contact details, generates assignment rule issues
2020-09-28 13:30:09 +05:30
hasnain2808
2a601e59bf
fix(UAE VAT 21): remove extra legend
2020-09-28 13:26:43 +05:30
hasnain2808
bed1add349
docs(UAE VAT 21): add docstrings
2020-09-28 13:26:05 +05:30
hasnain2808
815b7584dd
refactor(UAE VAT 21): seperate get_chart, get_data
2020-09-28 13:24:40 +05:30
Anupam
519a00ce44
fix: flushing contact details, generating assignment rule issues
2020-09-28 13:10:06 +05:30
hasnain2808
79aca28453
refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21
2020-09-28 12:27:41 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html
2020-09-28 10:59:43 +05:30
Mangesh-Khairnar
98658603dd
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-09-28 02:10:53 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13
2020-09-27 20:09:00 +05:30
Mangesh-Khairnar
a26c6b4c2d
fix: fetch account balance info
2020-09-25 23:56:39 +05:30
hasnain2808
127fbfcb93
feat(UAE VAT 21): Added Print Format
2020-09-25 20:42:54 +05:30
Anupam Kumar
6e0c1eeb68
Merge branch 'develop' into quotation-portal
2020-09-25 20:04:43 +05:30
prssanna
fec4ea5643
fix: set stock uom in tem while creating material request from stock entry
2020-09-25 18:01:12 +05:30
hasnain2808
321b5f54ae
feat(UAE VAT 21): Add Roles for UAE VAT 21 Report
2020-09-25 14:24:57 +05:30
hasnain2808
72cad2a8ab
feat(UAE VAT 21): Add zero rated and vat exempt
2020-09-25 13:13:38 +05:30
rohitwaghchaure
7512565184
fix: Patient Appointment not able to save ( #23434 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-25 12:45:47 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
hasnain2808
5225215d31
feat(UAE VAT 21): Add rows for inputs and tourists
2020-09-24 18:41:43 +05:30
marination
be4dbad823
style: (minor) Reduce loc
2020-09-24 16:43:25 +05:30
Anupam
dd2f547c3b
fix: Ui fixes
2020-09-24 16:37:08 +05:30
Anupam
5a72022289
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal
2020-09-24 16:18:47 +05:30
Anupam
78ee75d744
fix: review changes
2020-09-24 16:17:02 +05:30
marination
a119688e32
fix: (RFQ/SQ) Link to Material Requests in Tools section
2020-09-24 15:57:43 +05:30
Saqib
2fa2a40b3f
chore: make asset movement transaction date match with purchase date & time ( #23423 )
2020-09-24 15:07:29 +05:30
Rucha Mahabal
9ed208364d
Merge branch 'develop' into enrollment-fixes
2020-09-24 14:31:23 +05:30
Anupam
a4df105813
fix: UI fixes
2020-09-24 13:21:54 +05:30
hasnain2808
3ef11b1d64
feat(UAE VAT 21): Add region fields for UAE VAT 21
2020-09-24 13:21:23 +05:30
marination
4f395cce54
chore: Add Filter Group to dialogs
2020-09-24 12:43:41 +05:30
marination
8370d9b997
fix: Check Company in Payment Entry before selecting values
2020-09-24 11:51:03 +05:30
Anupam
09775bbdaa
feat: showing UOM even item price is hidden
2020-09-24 11:19:32 +05:30
Shivam Mishra
0bd8719035
Merge branch 'develop' into better-logging-for-membership
2020-09-24 10:32:41 +05:30
Shivam Mishra
cee891aa92
refactor: better logging for membership
2020-09-24 10:31:36 +05:30
Anupam
c077fac2a6
feat: provision to draft quotation from portal
2020-09-23 22:02:31 +05:30
Marica
d5e6eb75cf
Merge branch 'develop' into supplier-quotn-comparison
2020-09-23 21:06:18 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current ( #23361 )
2020-09-23 17:19:11 +05:30
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard ( #23406 )
2020-09-23 17:14:37 +05:30
Rucha Mahabal
46d4180381
refactor: Issue form cleaned up and renamed Minutes to First Response field ( #23066 )
...
* refactor: re-order fields in Issue DocType
* refactor: rename Mins to First Response to First Response Time
* refactor: First Response Time Reports for Issue and Opportunity
* fix: added patch for renamed fields and setting durations
* chore: update CRM and Support Desk Pages for Response Time reports
* fix: first response time for opportunity report
* fix: patch
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-09-23 16:53:16 +05:30
Mangesh-Khairnar
4eb215badb
fix: bind callback callback for realtime event
2020-09-23 15:55:21 +05:30
Marica
f804eacfb5
Merge branch 'develop' into fix-report-gp
2020-09-23 15:36:23 +05:30
Michelle Alva
879a8ef26b
fix: Change button label in Item ( #23410 )
2020-09-23 15:36:07 +05:30
Raffael Meyer
8b78bf19bd
Merge branch 'develop' into website_theme_scss
2020-09-23 11:38:59 +02:00
Afshan
8be51e22c4
fix: escape apostrophe in cost centre and project if exist
2020-09-23 14:52:36 +05:30
marination
fd155408e5
fix: Check if account exists in parent company on rename
...
- Check if child company is dependent on parent company
- Check if account-to-be-renamed exists in parent, if yes, block
- Revised Test basd on the same
2020-09-23 14:42:10 +05:30
Saqib
1831893b77
fix: failed workflow condition error message in update items ( #23393 )
2020-09-23 13:01:49 +05:30
Marica
dd10c54baa
Merge branch 'develop' into supplier-quotn-comparison
2020-09-23 12:58:35 +05:30
Deepesh Garg
2bf4245334
fix: Conversion factor fixes in Stock Entry
2020-09-23 12:50:06 +05:30
gavin
639542c81d
Merge pull request #22867 from marination/youtube-analytics
...
feat: Youtube interactions via Video
2020-09-22 18:02:31 +05:30
marination
6087fcaa9b
chore: Added video settings to List View Menu
2020-09-22 17:48:04 +05:30
rohitwaghchaure
27bccd7f81
Merge pull request #23397 from deepeshgarg007/search_field_batch_query
...
feat: Show searchfields in batch query
2020-09-22 16:59:24 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return
2020-09-22 15:39:25 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics
2020-09-22 15:36:00 +05:30
Anupam
c39b65a5f5
fix: quality procedure parent
2020-09-22 14:23:54 +05:30
Deepesh Garg
a0d192eae4
feat: Show searchfields in batch query
2020-09-22 13:54:07 +05:30
Mangesh-Khairnar
97ab96c8bf
fix: handle api changes from callbacks
2020-09-22 12:58:32 +05:30
Shivam Mishra
2b53b98c1d
fix: reload dashboard ( #23380 )
2020-09-22 12:18:12 +05:30
rohitwaghchaure
9e6d377eea
Merge pull request #23370 from prssanna/account-user-permission
...
fix: apply user permissions in tax accounts query
2020-09-22 10:34:35 +05:30
rohitwaghchaure
7230b0f9a0
Merge pull request #23360 from anupamvs/batch-wise
...
fix: Batch-Wise Balance History filter validation
2020-09-22 10:32:51 +05:30
Marica
cbac025a5f
Merge branch 'develop' into supplier-quotn-comparison
2020-09-21 22:08:38 +05:30
Mangesh-Khairnar
e3c6128638
fix(plaid): do not send null list in account ids ( #23376 )
2020-09-21 18:50:22 +05:30
Saurabh
30dbfc31e2
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance
...
Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule
2020-09-21 17:03:46 +05:30
Saurabh
324cbe89f8
Merge pull request #23359 from abhishekbalam/activation
...
fix(activation): Added New DocTypes in get_level()
2020-09-21 15:38:45 +05:30
prssanna
de7a2bc4be
fix: apply user permissions in tax accounts query
2020-09-21 13:57:04 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) ( #23318 )
...
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
2020-09-21 13:14:07 +05:30
Abhishek Balam
97f61d233e
fix: breadcrumbs for maintenance visit and schedule under support
2020-09-21 13:00:43 +05:30
Deepesh Garg
44c692ed40
Merge pull request #23278 from barry86m/patch-3
...
fix: sql error on saving sales invoice without a sales order
2020-09-20 20:40:16 +05:30
Deepesh Garg
c152b92ef4
Update erpnext/controllers/selling_controller.py
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-20 20:04:10 +05:30
Deepesh Garg
5c8dd6a0ed
Merge pull request #23355 from Anurag810/accounts_recievable
...
fix: Cost Center filter in accounts receivable and payable report
2020-09-20 19:36:30 +05:30
Saqib
f2ea3877c8
fix: depreciation start date ux fixes ( #23339 )
2020-09-20 19:31:18 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set ( #23334 )
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-19 19:33:21 +05:30
Deepesh Garg
6bcfffda1d
Merge branch 'develop' into barredterra-patch-1
2020-09-19 18:33:14 +05:30
Deepesh Garg
c646a56d68
fix: Update modified timestamp
2020-09-19 18:28:20 +05:30
Deepesh Garg
e3ee63f677
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter
...
fix: warehouse address filtered based on warehouse
2020-09-19 18:17:08 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error
...
fix: set_taxes() missing 1 required positional argument: 'company'
2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-19 18:05:58 +05:30
marination
b782d2a99d
fix: Added back accidentally deleted field
2020-09-19 01:04:28 +05:30
marination
90d9d80ef9
fix: More MR UX fixes
2020-09-19 00:43:53 +05:30
Mangesh-Khairnar
a3ac4bf681
fix: create payment request via pos
2020-09-18 19:47:33 +05:30
Saqib
7126e179c3
fix: button click event not working in POS custom fields ( #23358 )
2020-09-22 16:35:11 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator ( #23350 )
...
* fix: reset owner values in doctype to Administrator
* fix: updated modified value
* fix: also fixed modified by
* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Anupam
bf166736b0
fix: Batch-Wise Balance History filter validation
2020-09-18 17:15:49 +05:30
Abhishek Balam
123eaea1a6
fix: added new doctypes in get_level
2020-09-18 16:35:59 +05:30
Michelle Alva
cc6ca97dc5
fix: Item-wise Sales History Report Error ( #23349 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-18 15:50:29 +05:30
Saqib
c29ee691d4
fix: button click event not working in POS custom fields ( #23358 )
2020-09-18 15:27:17 +05:30
Marica
2cfaf71d59
Merge branch 'develop' into supplier-quotn-comparison
2020-09-18 15:22:59 +05:30
Anurag Mishra
170ecdc76e
fix: No handlefor Cost centers in Accounts Receivable
2020-09-18 13:26:46 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is []
2020-09-18 13:58:23 +08:00
Deepesh Garg
6f3d93e5a0
fix: Taxes not getting fetched from Opportunity to Quotation
2020-09-18 11:23:35 +05:30
Afshan
d5710b4d6f
style: removed extra spaces
2020-09-17 13:01:47 +05:30
Afshan
e813684433
fix: warehouse address filtered based on warehouse
2020-09-17 12:57:26 +05:30
Deepesh Garg
2aea184f6f
Merge pull request #23309 from anupamvs/sales-analytics
...
feat: added project in Sales Analytics report
2020-09-17 12:37:14 +05:30
Rucha Mahabal
c78ca36ee5
fix(Non Profit): Hide Address and Contact section for unsaved docs
2020-09-16 23:47:33 +05:30
Anupam Kumar
11649efc41
Merge branch 'develop' into sales-analytics
2020-09-16 21:45:57 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark
...
feat: added option to add custom remarks in payment entry
2020-09-16 13:38:04 +05:30
Deepesh Garg
15f698251b
Merge pull request #23079 from marination/item-tax-update-items
...
fix: Item Tax Updating via `Update Items` in SO/PO
2020-09-15 20:47:20 +05:30
Deepesh Garg
db52cfe05a
Merge pull request #22849 from alyf-de/datev_refactor
...
refactor: move datev-specific stuff to utils
2020-09-15 19:50:00 +05:30
Rucha Mahabal
8193582645
fix: codacy issue
2020-09-15 18:53:38 +05:30
Marica
9ce5c77a21
Merge branch 'develop' into supplier-quotn-comparison
2020-09-15 18:50:34 +05:30
Rucha Mahabal
253936c8df
fix: create Course Enrollment only for courses added in Program Enrollment
2020-09-15 18:16:42 +05:30
Rucha Mahabal
42d7acf522
fix: academic term and year date validations
2020-09-15 17:52:47 +05:30
Marica
f63b6719e3
Merge branch 'develop' into item-tax-update-items
2020-09-15 17:45:05 +05:30
marination
f995f517c9
fix: Test
2020-09-15 17:06:27 +05:30
Rucha Mahabal
f5eb45bf23
fix: validate academic term while checking for enrollment duplication
2020-09-15 17:01:00 +05:30
Rucha Mahabal
68a07eda72
fix: program enrollment date not considered during course enrollment
2020-09-15 16:55:35 +05:30
Deepesh Garg
2f50cb3e58
fix: Supplier trigger onload
2020-09-15 15:00:32 +05:30
Rohit Waghchaure
4f3b7da9ba
fix: set_taxes() missing 1 required positional argument: 'company'
2020-09-15 14:47:36 +05:30
Mangesh-Khairnar
27f81e06ea
fix: create custom pos fields
2020-09-15 14:38:06 +05:30
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics
2020-09-15 13:24:02 +05:30
Anurag Mishra
9397b7f58b
fix: requested changes
2020-09-15 12:36:01 +05:30
Anupam
bae2d5d485
fix: review changes
2020-09-15 12:12:31 +05:30
marination
665c27af58
fix: Merge conflict missing line
2020-09-15 12:04:38 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items
2020-09-15 11:30:22 +05:30
marination
4bb8d0c193
chore: Test for PO
2020-09-15 11:18:02 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO ( #22869 )
...
* feat: uom in update items for SO & PO
* fix: supplied items doesn't updates on uom change
* chore: add uom and conv factor change test
* fix: test
* fix: purchase order updates are not tracked
* fix: fetch conversion factor on uom change
* fix: codacy
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items
2020-09-15 09:49:06 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice ( #23027 )
2020-09-15 09:44:46 +05:30
marination
b7cd84196d
fix: Revert tax calculation changes
2020-09-15 09:42:51 +05:30
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics
2020-09-14 11:21:58 -07:00
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry ( #23051 )
2020-09-14 21:12:36 +05:30
Marica
a544e10778
Merge branch 'develop' into supplier-quotn-comparison
2020-09-14 20:17:59 +05:30
Saqib
6db92fbb6a
feat: validate workflow before so/po update items ( #23024 )
...
* feat: validate workflow before so/po update items
* fix: incorrect workflow validation on so/po update items
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-14 19:54:17 +05:30
Deepesh Garg
93d7c2f1da
Merge pull request #23283 from ruchamahabal/fix-student-email-id
...
fix: Set student email id mandatory only if skip user creation is disabled
2020-09-14 19:34:10 +05:30
Mangesh-Khairnar
757fa5d010
fix(shopping-cart-settings): filter payment gateway accounts
2020-09-14 17:44:51 +05:30
marination
59239172a1
feat: Supplier Quotation Comparison - v3
2020-09-14 17:34:21 +05:30
Mangesh-Khairnar
40d3add63c
feat(payment-gateway-account): add additional payment channel
2020-09-14 15:14:36 +05:30
Rucha Mahabal
026cf2d3cc
Merge branch 'develop' into refactor-lab-module
2020-09-14 14:45:19 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items
2020-09-14 11:09:32 +05:30
marination
9205101ecf
fix: Make Reference fields mandatory in Quality Inspection
2020-09-12 16:17:13 +05:30
marination
0a688005be
fix: Make sure Supplier/Customer is selected before fetching Items.
2020-09-12 15:39:27 +05:30
barredterra
16f1435d63
fix: codacy
2020-09-11 18:57:58 +02:00
barredterra
41978ac882
Merge branch 'develop' into datev_refactor
2020-09-11 17:54:50 +02:00
barredterra
8e41fdfee4
Merge branch 'develop' into website_theme_scss
2020-09-11 16:05:49 +02:00
barredterra
60bfbbc5af
fix: use path istead of hook
2020-09-11 16:05:10 +02:00
marination
02c550c07d
fix: Redundant imports
2020-09-11 16:22:54 +05:30
Marica
1807437fe0
Merge branch 'develop' into youtube-analytics
2020-09-11 16:18:23 +05:30
Marica
4153a9f8de
Merge branch 'develop' into pr-dn-return
2020-09-11 16:10:48 +05:30
marination
9533318832
chore: Tests for Rename and Add child Account
2020-09-11 16:09:27 +05:30
Anupam K
ed08e593c3
feat: added project in Sales Analytics report
2020-09-11 14:03:31 +05:30
Saqib
cd89994b33
fix: multiple pos issues ( #23297 )
...
* fix: returns can be made against unconsolidated invoices
* fix: indentation
* fix: mode of payment not fetching for pos returns
* patch: default pos profile print format
* fix: tests
* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
hasnain2808
f44524dd3e
feat: Added a Chart to compare Vat and sales between emirates
2020-09-10 18:35:04 +05:30
marination
37b99d202d
fix: Separate function to get bulk and single youtube stats
2020-09-10 18:27:20 +05:30
hasnain2808
323791d123
refactor: added docstrings
2020-09-10 17:53:29 +05:30
Rucha Mahabal
a29436dc91
fix: codacy
2020-09-10 17:45:17 +05:30
hasnain2808
031d77be2e
feat: add reverse charge to uae vat report
2020-09-10 17:40:01 +05:30
Rucha Mahabal
c0f9d1b65a
test: Lab Module
2020-09-10 17:33:52 +05:30
Suraj Shetty
67095d239f
fix: Custom dashboard sections
2020-09-10 17:15:52 +05:30
Mangesh-Khairnar
2dabd2182f
feat: add mpesa integration
2020-09-10 17:05:43 +05:30
marination
799d663398
fix: Make set_youtube_statistics reusable and job logic fix
...
- Make sure job runs only once every hour
- set_youtube_statistics should be usable in and outside class
2020-09-10 16:42:20 +05:30
Shivam Mishra
2b405b9bb3
feat: add icon to healthcare desk page
2020-09-10 15:37:54 +05:30
Gavin D'souza
71ac399369
fix: Commonified function and updated scheduler events
...
Co-authored-by: marination <maricadsouza221197@gmail.com>
2020-09-10 13:58:48 +05:30
hasnain2808
91f1e26672
feat: Add rated supplies rows in UAE VAT report
2020-09-10 13:55:14 +05:30
Gavin D'souza
0a0e258d8b
feat: Add Desk Page for Utilities for Video group
2020-09-10 13:12:35 +05:30
Rucha Mahabal
42bff3289d
Merge branch 'develop' into refactor-lab-module
2020-09-10 12:36:29 +05:30
Rucha Mahabal
2388199347
Merge branch 'develop' into fix-student-email-id
2020-09-10 12:16:16 +05:30
Rucha Mahabal
1915a60834
fix: education settings check
2020-09-10 12:13:58 +05:30
Marica
6520655d59
Merge branch 'develop' into youtube-analytics
2020-09-10 10:16:02 +05:30
marination
53cd60c217
fix: Patch reload doctype
2020-09-09 20:57:10 +05:30
hasnain2808
7b7a8e1309
feat: RCM for UAE VAT
2020-09-09 20:54:30 +05:30
marination
83a03689a1
fix: Use independent item for DN Test
2020-09-09 20:51:01 +05:30
marination
dc5f2aa8b8
chore: Patch to set returned qty in PR and DN
2020-09-09 17:56:20 +05:30
marination
efb211af6d
chore: Fix Received/Delivered Items to Billed Logic
2020-09-09 16:24:11 +05:30
Marica
52e87d1a4f
Merge branch 'develop' into pr-dn-return
2020-09-09 11:56:26 +05:30
Saqib
ec6a97fb6a
fix: cannot delete pos page if linked with desk page ( #22993 )
...
* fix: cannot delete pos page if linked with desk page
* fix: replace pos page links with point-of-sale page
Co-authored-by: gavin <gavin18d@gmail.com>
2020-09-09 10:54:14 +05:30
Deepesh Garg
dc84633860
Merge pull request #23301 from deepeshgarg007/closed_loan_amount
...
fix: Amount for closed loans
2020-09-08 21:32:54 +05:30
Deepesh Garg
846e6d4803
fix: Add test
2020-09-08 21:32:06 +05:30
Deepesh Garg
f247686ace
fix: Amount for closed states
2020-09-08 21:26:06 +05:30
marination
8484d1cd95
fix: Patch and test codacy
2020-09-08 20:58:33 +05:30
marination
315bf3051c
chore: Tests for Delivery Note
2020-09-08 19:27:36 +05:30
Saqib
8f43cf2c9a
fix: asset movement date for backdated asset entry ( #23298 )
2020-09-08 17:44:47 +05:30
rohitwaghchaure
93dccd2eaa
Merge pull request #23132 from anupamvs/item-group-filter-portal
...
fix: [Portal] added filter show in website
2020-09-08 17:03:54 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug
...
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-08 16:59:29 +05:30
marination
e35fd5e305
chore: Tests for Purchase Receipt
2020-09-08 16:24:10 +05:30
Anupam Kumar
09e2cb5f87
Merge branch 'develop' into item-group-filter-portal
2020-09-08 14:54:31 +05:30
Deepesh Garg
f7731b0715
fix: TDS applicable on creating PI from get items button
2020-09-08 13:41:04 +05:30
Afshan
12ab8ebc95
fix: removed ignore permission flag
2020-09-08 12:55:42 +05:30
Marica
c8eca9d5f3
Merge branch 'develop' into handle-irs
2020-09-08 12:03:45 +05:30
Rucha Mahabal
f7619df8b2
fix: Lock row in subquery while setting delivered qty ( #23100 )
2020-09-08 11:57:45 +05:30
Afshan
9691422fb7
feat: added report for mismatch in serial nos and stock quantity in warehouse ( #22669 )
...
* feat: added report for mismatch in serial nos and stock quantity in warehouse
* style: removed print statement
* fix: rename of reports and refactor of code
* fix: handled null condition for actual qty and added report link in stock desk page
* style: breaking code in multiple lines
2020-09-08 11:57:15 +05:30
Marica
0411026ad6
Merge branch 'develop' into pr-dn-return
2020-09-08 10:48:44 +05:30
rohitwaghchaure
31fd90136d
Merge pull request #23243 from Anurag810/overlap_for_additional_salary
...
feat: Overlap validation additional salary
2020-09-08 10:18:41 +05:30
rohitwaghchaure
7d7fa79efa
Update additional_salary.py
2020-09-08 10:18:18 +05:30
rohitwaghchaure
900d0e3ae2
Merge pull request #23245 from Anurag810/attendance_calendar_map
...
fix: Attendance calendar map fix
2020-09-08 10:14:37 +05:30
rohitwaghchaure
842cb6d1d6
Update shift_assignment.py
2020-09-08 10:14:04 +05:30
Anupam Kumar
7131024bf9
Merge branch 'develop' into item-group-filter-portal
2020-09-08 10:04:51 +05:30
rohitwaghchaure
0cb805308f
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order
...
fix: capture advance payments in payment order
2020-09-08 09:59:47 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent
...
fix proposed by Andriesvn in bug report
closes #22180
2020-09-08 00:27:57 +01:00
Deepesh Garg
b828e2fcf4
Merge pull request #23287 from deepeshgarg007/lsu_api_fix
...
fix: Only submitted Loan security pledges should be approved
2020-09-07 23:23:55 +05:30
Deepesh Garg
03b0ad4f98
fix: Only submitted Loan security pledges should be approved
2020-09-07 23:22:21 +05:30
Anupam Kumar
22bd03e63c
Merge branch 'develop' into item-group-filter-portal
2020-09-07 20:20:42 +05:30
Rucha Mahabal
4673bed67e
fix: codacy issues
2020-09-07 20:12:29 +05:30
Rucha Mahabal
06f89a1b94
fix: Set student email id mandatory only if skip user creation is disabled
2020-09-07 19:46:53 +05:30
marination
f18dd05c00
fix: Missing import and typo
2020-09-07 18:59:57 +05:30
Marica
54ab426c1c
Merge branch 'develop' into youtube-analytics
2020-09-07 18:54:11 +05:30
marination
06ee0ea00b
feat: Added Scheduler Job to auto update statistics
...
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
2020-09-07 18:49:06 +05:30
Deepesh Garg
74ab1084b3
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-07 17:55:10 +05:30
Deepesh Garg
af1c4ba443
Merge pull request #23279 from deepeshgarg007/loan_closure_interest
...
fix: Pending loan interest accrual on loan closure
2020-09-07 15:01:33 +05:30
Deepesh Garg
afefa878b0
fix: Pending loan interest accrual on loan closure
2020-09-07 14:57:44 +05:30
Deepesh Garg
da6074a84c
fix: Pending loan interest accrual on loan closure
2020-09-07 14:55:04 +05:30
marination
9ce38de439
chore: Key Validation and restructure
...
- Added API Key validation in Video Settings
- Moved Statistics section above description in Video
- Moved id retrieving from URL to py side
- Removed js side calls, added section toggling in js
- Restructured Code
2020-09-07 13:27:17 +05:30
hasnain2808
2744765757
feat(UAE VAT Format): add fields for emirates in address and sales invoice
2020-09-07 12:31:19 +05:30
Mangesh-Khairnar
06130ee56b
fix: leave ledger patch ( #23182 )
2020-09-07 11:53:50 +05:30
Anupam Kumar
209f7c76c9
feat: added transaction_type in leave ledger enter ( #23258 )
2020-09-07 11:50:24 +05:30
barry86m
fa98e81f0b
fix: sql error on saving sales invoice without a sales order
2020-09-07 01:36:15 +01:00
Anupam Kumar
ffd30beeca
Merge branch 'develop' into item-group-filter-portal
2020-09-06 21:48:16 +05:30
Anupam Kumar
924618e1e3
Merge branch 'develop' into opportunity-status
2020-09-06 21:24:32 +05:30
rohitwaghchaure
937b63433d
Merge pull request #23270 from kasgel/patch-1
...
fix(utils): pass stock_qty to get_pricing_rule_for_item
2020-09-06 20:46:15 +05:30
Deepesh Garg
5158d0fbba
fix: Repayment Method not visible correctly
2020-09-05 21:16:57 +05:30
kasgel
a59f8640d1
fix: pass stock_qty to get_pricing_rule_for_item
...
get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules.
Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.
2020-09-05 12:15:49 +02:00
Deepesh Garg
1b4ed454d2
fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge
2020-09-04 22:42:41 +05:30
Deepesh Garg
e4c38e5fe5
fix: Remove print statement
2020-09-04 22:30:13 +05:30
Deepesh Garg
4d636fde3a
fix: API changes in loan security unpledge utility
2020-09-04 22:23:30 +05:30
Mangesh-Khairnar
7456ffca0f
fix: teardown created payment order
2020-09-04 19:59:01 +05:30
Mangesh-Khairnar
a76bf4d7af
fix: remove unused imports
2020-09-04 19:08:08 +05:30
Mangesh-Khairnar
d9e4883392
test: check payment order creation against payment entry
2020-09-04 18:55:14 +05:30
rohitwaghchaure
515d8b9e50
Merge pull request #23259 from anupamvs/se-quntity
...
fix: SE quantity data type issue
2020-09-04 16:07:13 +05:30
rohitwaghchaure
c9a5afaa1c
Merge pull request #23263 from Semiranis/uom_after_qty
...
feat: Option to print UOM after quantity
2020-09-04 16:06:46 +05:30
Shivam Mishra
4a238a2093
feat: don't allow guests
2020-09-04 15:18:16 +05:30
Anupam K
faebef21b7
fix: SE quantity data type issue
2020-09-04 15:09:16 +05:30
Mangesh-Khairnar
e1889d0c1b
fix(payment entry): update payment order status
2020-09-04 14:45:19 +05:30
Mangesh-Khairnar
8d8af94182
fix: capture advance payments in payment order
2020-09-04 12:17:56 +05:30
Frappe ERPnext
2e8e06c350
Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty
2020-09-03 18:08:02 +02:00
Frappe ERPnext
9355641c49
refactor: logic moved to standard template
...
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4
Revert "feat: Option to print UOM after quantity"
...
This reverts commit a787882a8f
2020-09-03 17:30:25 +02:00
Marica
8d6b2d016f
Merge branch 'develop' into leaderboard-supplier
2020-09-03 20:08:37 +05:30
marination
2a56000460
fix: Supplier Leaderboard fix
2020-09-03 19:45:04 +05:30
Deepesh Garg
b306fa355d
Merge pull request #23248 from deepeshgarg007/pda_account_filter
...
fix: Account filter in Process Deferred Accounting doctype
2020-09-03 19:22:56 +05:30
Deepesh Garg
9b681770d0
fix: Account filter in Process Deferred Accounting doctype
2020-09-03 18:09:02 +05:30
Anurag Mishra
e5b7cb0c15
fix: data was not properly maped
2020-09-03 16:59:21 +05:30
gavin
f20b6360de
Merge branch 'develop' into overlap_for_additional_salary
2020-09-03 15:27:58 +05:30
gavin
c09b92d673
Merge branch 'develop' into naming-series-proj
2020-09-03 15:23:06 +05:30
Anurag Mishra
7952f89596
feat: Overlap validation additional salary
2020-09-03 15:21:35 +05:30
Rohit Waghchaure
68b0108301
fix: incorrect qty after transaction in stock ledger entry
2020-09-03 15:10:07 +05:30
rohitwaghchaure
d00bc3f422
Merge branch 'develop' into item-group-filter-portal
2020-09-03 15:04:04 +05:30
rohitwaghchaure
4b59043266
Merge pull request #23241 from Anurag810/hiding_regional_reports
...
feat: removed roles for some regional report and added via setup
2020-09-03 15:01:07 +05:30
rohitwaghchaure
6ffe809c66
Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor
...
fix: set conversion factor while creating RFQ from Opportunity
2020-09-03 14:45:01 +05:30
Anurag Mishra
54cd194b41
feat: removed roles for some reginal report and added via setup
2020-09-03 13:52:40 +05:30
Rucha Mahabal
979ad180fa
fix: update rfq item in postprocess
2020-09-03 11:03:22 +05:30
michellealva
0857e6d669
fix: Add "Bank Clearance" and "Bank Reconciliation" in desk
2020-09-03 10:37:43 +05:30
Michelle Alva
d8c38249e0
fix: Change naming series
...
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-09-03 09:04:21 +05:30
Frappe ERPnext
f28bef868d
feat: Checkbox for activation of printing UOM after quantity
...
Checkbox will be added to Frappe after installation of ERPNext.
(Print Settings docType is part of frappe app, not erpnext app)
2020-09-02 21:42:52 +02:00
Frappe ERPnext
be3b8a1c96
Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty
2020-09-02 21:31:31 +02:00
Anupam Kumar
c3984691b3
fix: Sales funnel data is inconsistent ( #23110 )
...
* fix: Sales funnel data is inconsistent
* fix: data inconsistency
* fix: Converted Count
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-02 20:01:14 +05:30
Anurag Mishra
41f421d400
feat: added option to add custom remarks in payment entry
2020-09-02 13:47:18 +05:30
Rucha Mahabal
a1b5d57076
test: make rfq from opportunity
2020-09-02 13:14:01 +05:30
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total
...
feat: enable total row in Gross Profit Report
2020-09-02 12:18:41 +05:30
rohitwaghchaure
1ab6c3fe94
Merge pull request #23059 from marination/credit-limit-email
...
fix: Credit Limit Email not working
2020-09-02 12:14:51 +05:30
marination
099d6718c9
fix: Dont Copy or Print Naming Series
2020-09-02 11:54:55 +05:30
Rucha Mahabal
d2881ba4dd
fix: set conversion factor while creating RFQ from Opportunity
2020-09-02 11:52:59 +05:30
marination
f51cf9f23e
fix: Crop Cycle Test
2020-09-02 11:43:36 +05:30
rohitwaghchaure
efd1ac5840
Merge pull request #23050 from anupamvs/stock-entry-type
...
fix: deleting unused Stock Entry Type
2020-09-02 11:43:29 +05:30
rohitwaghchaure
f898c807b8
Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes
...
Fix: job card issues
2020-09-02 11:41:37 +05:30
Rohit Waghchaure
86a190652e
fix: incorrect job card timer issue
2020-09-02 11:04:56 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters
...
fix: General Ledger filter validation
2020-09-01 17:53:32 +05:30
Deepesh Garg
36b7bb0282
Merge pull request #23229 from deepeshgarg007/gst_template_update
...
fix: Update tax template on supplier address change
2020-09-01 16:27:44 +05:30
Marica
329292b9c3
Merge branch 'develop' into credit-limit-email
2020-09-01 16:18:12 +05:30
Deepesh Garg
cebf803455
fix: Update tax template on supplier address change
2020-09-01 16:15:28 +05:30
rohitwaghchaure
a3dd156a8a
Merge pull request #22796 from anupamvs/variance-report-fix
...
fix: Target variance report signs
2020-09-01 15:12:21 +05:30
rohitwaghchaure
9bbb9dad8b
Merge pull request #23217 from anupamvs/product-contact-us-v13
...
fix: contact us button issue
2020-09-01 15:10:37 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order ( #22821 )
...
* fix: get_items from product bundle for purchase order
* fix: Don't overwrite doctype while setting attributes in child row
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-01 15:01:32 +05:30
Suraj Shetty
9cc87f8b9a
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-01 13:55:49 +05:30
Suraj Shetty
df00c5c846
fix: Update erpnext logo
2020-09-01 13:55:34 +05:30
Shivam Mishra
d19947fccd
Merge pull request #23148 from scmmishra/feat-exotel-customer-link
2020-09-01 13:47:31 +05:30
Shivam Mishra
e91a5437bd
Merge pull request #23038 from scmmishra/iff-invoicing
2020-09-01 13:35:32 +05:30
Shivam Mishra
1b5de62454
Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page
...
feat: add integrations desk page
2020-09-01 13:34:52 +05:30
Marica
a222081316
Merge branch 'develop' into naming-series-proj
2020-09-01 12:35:11 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix
2020-09-01 09:31:22 +05:30
Anupam Kumar
477e41197e
Merge branch 'develop' into item-group-filter-portal
2020-09-01 09:09:19 +05:30
Deepesh Garg
37cb44e109
Merge pull request #23127 from marination/quoted-item-report-v2
...
feat: Quoted Item Comparison Report Enhancements v2
2020-08-31 21:28:56 +05:30
Deepesh Garg
26eab47851
Merge pull request #23221 from deepeshgarg007/pending_principal
...
fix: Pending amount after loan closure request
2020-08-31 21:25:53 +05:30
Deepesh Garg
14718e2bde
fix: Add unit test for pending principal amount
2020-08-31 21:21:05 +05:30
Afshan
1dc9a9b669
fix: reverse journal entry for multi-currency ( #23165 )
...
* fix: reverse journal entry for multi-currency
* fix: test case for reverse journal entry
2020-08-31 20:35:05 +05:30
marination
bc6c4e864d
fix: Status in Report and filter query
2020-08-31 20:32:17 +05:30
Deepesh Garg
25042a22eb
fix: Pending amount after loan closure request
2020-08-31 19:17:29 +05:30
marination
8938d1040d
fix: Rename/Update Child company Accounts as well
2020-08-31 18:18:10 +05:30
Deepesh Garg
bdc933b3d3
Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation
...
fix: Cancellation of accounting transactions within closed accounting period
2020-08-31 17:16:55 +05:30
Deepesh Garg
d79b511e3f
Merge pull request #22950 from deepeshgarg007/billing_address_fetch
...
fix: Add default billing address for purchase documents
2020-08-31 17:16:31 +05:30
Deepesh Garg
5523142ced
Merge pull request #23078 from deepeshgarg007/hsn_wise_json
...
feat: JSON download for HSN wise outward summary
2020-08-31 17:16:03 +05:30
Anupam Kumar
8089b00df2
Merge branch 'develop' into item-group-filter-portal
2020-08-31 16:42:47 +05:30
marination
fdcda85f87
fix: Validate Missing Accounts in Child Companies
...
- If parent account exists in Parent and now child, throw error
2020-08-31 16:10:52 +05:30
Deepesh Garg
56ddf41873
Merge pull request #23211 from michellealva/tax-cat
...
feat: Allow Rename for Tax Category
2020-08-31 15:56:43 +05:30
Anupam K
f9f26d2fa4
fix: contact us button issue
2020-08-31 14:34:42 +05:30
Rohit Waghchaure
d0aafece32
fix: incorrect completed qty against operation in work order if workstation is different in job card
2020-08-31 13:41:17 +05:30
Rohit Waghchaure
a5963e1b2c
fix: user created manual job card not linking job card operations with work order operations
2020-08-31 13:40:55 +05:30
Rohit Waghchaure
e7ab53a711
fix: completed qty not updated in work order
2020-08-31 13:40:01 +05:30
Shivam Mishra
d70e711aea
fix: events not deleted on cancelling maintenance schedule ( #22954 )
...
* feat: add participant to event_participant child table
* feat: add tests
* chore: update function name
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-31 13:14:32 +05:30
Deepesh Garg
d1b88af5b6
Merge pull request #23213 from deepeshgarg007/loan_disbursement_utility
...
feat: Utility function to get possible loan disbursal amount
2020-08-31 12:53:08 +05:30
Marica
ee56d0e0a9
Merge branch 'develop' into quoted-item-report-v2
2020-08-31 12:45:05 +05:30
Shivam Mishra
1c96befbaf
Merge branch 'develop' into feat-exotel-customer-link
2020-08-31 11:47:06 +05:30
Shivam Mishra
b4e0d300f7
Merge branch 'develop' into iff-invoicing
2020-08-31 11:46:41 +05:30
Marica
d2d350ce14
Merge branch 'develop' into credit-limit-email
2020-08-31 11:45:15 +05:30
Deepesh Garg
e8b121c2c2
fix: Add status in field list
2020-08-31 11:31:48 +05:30
Deepesh Garg
ce29757bff
fix: Import flt
2020-08-31 11:26:51 +05:30
Rucha Mahabal
5c6ed4dbcd
Merge branch 'develop' into refactor-lab-module
2020-08-31 09:50:30 +05:30
Deepesh Garg
a03ebf007c
Merge pull request #23212 from marination/customer-from-quotation
...
fix: Better error feedback on creating SO from Quotation
2020-08-30 23:24:02 +05:30
Deepesh Garg
a4259208e7
feat: Utility function to get possible loan disbursal amount
2020-08-30 23:09:23 +05:30
michellealva
f46c1c5164
fix: Change property of field
2020-08-30 21:37:45 +05:30
marination
e268d294b3
fix: Better error feedback on creating SO from Quotation
2020-08-30 21:01:34 +05:30
michellealva
c71e37c988
feat: Allow Rename for Tax Category
2020-08-30 19:42:24 +05:30
michellealva
288ced24db
feat: Add Naming Series for Project DocType
2020-08-30 19:33:27 +05:30
Syed Mujeer Hashmi
b23840bf7b
fix: Filter out cancelled entries in customer ledger summary
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-08-29 23:09:18 +05:30
rohitwaghchaure
2badd93d8f
Merge pull request #23193 from bhavesh95863/patch-10
...
fix: can't multiply sequence by non-int of type 'float
2020-08-28 20:01:05 +05:30
rohitwaghchaure
7c61779a94
Merge pull request #23195 from marination/purchase-over-receipt-subcontracted
...
fix: Raise Error on over receipt/consumption for sub-contracted PR
2020-08-28 19:59:51 +05:30
Raffael Meyer
a7ea0ffcf9
Merge branch 'develop' into barredterra-patch-1
2020-08-28 15:44:21 +02:00
barredterra
a162248f32
fix: use hook for website theme scss
2020-08-28 15:16:39 +02:00
Frappe ERPnext
a787882a8f
feat: Option to print UOM after quantity
...
Standard for ERPNext prints was UOM before quantity. Now user has a choice.
2020-08-28 13:28:52 +02:00
prssanna
fa400820bb
fix: move leaderboard style to frappe
2020-08-28 15:02:04 +05:30
marination
731bae170e
fix: Test for Over Receipt via PRs on a PO
2020-08-28 14:09:02 +05:30
Afshan
d659774190
fix:tests
2020-08-28 13:40:48 +05:30
Afshan
7586c3408e
fix: test case
2020-08-28 12:56:37 +05:30
Deepesh Garg
ecc282930a
Merge branch 'develop' into navbar_links
2020-08-28 12:48:46 +05:30
marination
e9274283bd
fix: Raise Error on over receipt/consumption for sub-contrcated PR
2020-08-28 12:21:10 +05:30
Deepesh Garg
6887382937
fix: Ignore cpmpany and bank account doctype while deleting company transactions ( #22953 )
2020-08-28 11:52:00 +05:30
bhavesh95863
3e9f493f15
fix: change parseFloat to flt
2020-08-28 11:15:02 +05:30
Rucha Mahabal
bae2a77d08
Merge branch 'develop' into barredterra-patch-1
2020-08-28 10:43:02 +05:30
Rucha Mahabal
8cdc3b5d91
Merge branch 'develop' into patch-9
2020-08-28 10:41:02 +05:30
rohitwaghchaure
78a32f79df
Merge pull request #23168 from ruchamahabal/fix-appointment-overlap
...
fix: don't overwrite patient appointment duration if already specified
2020-08-28 10:39:25 +05:30
rohitwaghchaure
3018d38940
Merge pull request #23170 from anupamvs/product-contact-us-v13
...
feat: Added phone field in product Inquiry
2020-08-28 10:38:44 +05:30
rohitwaghchaure
c31ae27227
Merge pull request #23176 from marination/pricing-rule-missing-fix
...
fix: Pricing Rule encoding missing line
2020-08-28 10:37:38 +05:30
rohitwaghchaure
939b95ad3c
Merge pull request #23190 from ruchamahabal/fix-bom-update
...
fix: BOM Update Tool failing due to Too Many Writes error
2020-08-28 10:35:59 +05:30
bhavesh95863
33f984c7af
fix: can't multiply sequence by non-int of type 'float
2020-08-27 21:49:21 +05:30
Suraj Shetty
f39bb116cc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-27 19:27:49 +05:30
prssanna
a324e9bd12
fix: remove text-muted and small class fromtree items
2020-08-27 19:26:14 +05:30
Suraj Shetty
a49af09705
fix: Primary button icon
2020-08-27 18:57:43 +05:30
Suraj Shetty
b6ebcd7559
refactor: Replace darkgray indicator with gray indicator
2020-08-27 18:57:18 +05:30
Rucha Mahabal
c8eea556d1
fix: BOM Update Tool failing due to Too Many Writes error
2020-08-27 18:54:25 +05:30
prssanna
744169833c
fix: replace indicator color darkgrey with darkgray
2020-08-27 17:06:10 +05:30
michellealva
ead2f6abf0
fix: Chage fiedtype of Customer's PO in Sales Invoice
2020-08-27 13:57:15 +05:30
Rucha Mahabal
1bd83e69ee
feat: added Installation Note and Warranty Claim links to Customer dashboard ( #23183 )
2020-08-27 13:06:52 +05:30
Marica
e7fabb10e1
Merge branch 'develop' into general-ledger-filters
2020-08-27 11:59:01 +05:30
Afshan
b719620d0c
fix: handleling condition if default company doesn't exist
2020-08-26 20:55:16 +05:30
Afshan
7600960d2b
fix: returned empty list if non US based company
2020-08-26 18:40:11 +05:30
bhavesh95863
bb5d886930
fix: account & cost center filter by company
2020-08-26 18:23:21 +05:30
marination
733fd5f03c
fix: get_applied_pricing_rule in taxes_and_totals
2020-08-26 18:23:12 +05:30
Marica
d741ac6871
Merge branch 'develop' into quoted-item-report-v2
2020-08-26 17:33:13 +05:30
Rucha Mahabal
cf2db41876
Merge branch 'develop' into fix-appointment-overlap
2020-08-26 16:33:27 +05:30
Anupam K
c7830f7107
feat: Added phone field in product Inquiry
2020-08-26 15:28:22 +05:30
Rucha Mahabal
9766adbf4e
fix: don't overwrite appointment duration if already specified
2020-08-26 14:53:23 +05:30
Rushabh Mehta
73f648473f
fix(minor): update_start_end_date_for_old_shift_assignment.py
2020-08-26 14:51:37 +05:30
Rushabh Mehta
a163d8bc84
fix(minor): rename_lost_reason_detail
2020-08-26 14:51:37 +05:30
Rushabh Mehta
544d18327c
fix(patch): quotation_lost_reason_detail
2020-08-26 14:51:37 +05:30
Rushabh Mehta
38fad58834
fix(patch)
2020-08-26 14:51:37 +05:30
rohitwaghchaure
fe0ecc2ff7
Merge pull request #23144 from anupamvs/product-image
...
fix: Homepage Featured Product image fetch issue
2020-08-26 13:05:50 +05:30
rohitwaghchaure
5f4b5f3f46
Merge pull request #23151 from ruchamahabal/fix-conversion-factor
...
fix: conversion factor for BOM exploded item rate
2020-08-26 13:01:13 +05:30
bhavesh95863
d888a59bd1
fix: set company filter in condition
2020-08-26 12:44:20 +05:30
Abhishek Balam
dc9af639a7
fix: move condition field
2020-08-26 12:26:15 +05:30
Abhishek Balam
7d0bb25aca
fix: dont show message on condition syntax error
2020-08-26 12:22:31 +05:30
Deepesh Garg
f4b939754c
fix: Codacy fixes
2020-08-26 12:10:12 +05:30
Deepesh Garg
29f187f4f3
Merge branch 'develop' into hsn_wise_json
2020-08-26 12:05:59 +05:30
Shivam Mishra
e1e5e3c915
Merge branch 'develop' into iff-invoicing
2020-08-26 11:30:01 +05:30
Michelle Alva
7a927cefbd
fix: Social Media Status hidden in Mobie View ( #23158 )
2020-08-26 10:32:26 +05:30
Deepesh Garg
b4a992e6a3
Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link
...
feat: add Maintenance Visit link in Customer and Sales Order dashboards
2020-08-25 21:04:00 +05:30
Anupam Kumar
91461a0016
fix: heading is hidden in the mobile view ( #23145 )
2020-08-25 21:01:17 +05:30
Michelle Alva
258b256dc6
fix: Add Delivery Note link in Sales Invoice Dashboard ( #23161 )
2020-08-25 20:37:39 +05:30
Rucha Mahabal
12f7aeb147
feat: add Maintenance Visit link in Sales Order dashboard
2020-08-25 19:03:35 +05:30
Rucha Mahabal
5bf0a51ed4
feat: add Maintenance Visit link in Customer dashboard
2020-08-25 18:22:06 +05:30
Rucha Mahabal
d43d1408cf
fix: conversion factor for BOM exploded item rate
2020-08-25 17:13:05 +05:30
Shivam Mishra
de4ac0c905
chore: remove stray tabs
2020-08-25 17:10:05 +05:30
Shivam Mishra
2030b66fc6
feat: add customer link to call log
2020-08-25 17:09:53 +05:30
Anupam K
42092cc377
fix: Homepage Featured Product image fetch issue
2020-08-25 15:29:18 +05:30
Rushabh Mehta
ee921052c0
fix(minor): test dependencies
2020-08-25 14:35:49 +05:30
Rushabh Mehta
b5b8f9e72d
fix(minor): import
2020-08-25 14:14:23 +05:30
Rushabh Mehta
8ad0fa48bf
fix(minor): circular imports?
2020-08-25 12:24:31 +05:30
Rushabh Mehta
ff5d19609f
fix(hot): Pricing Rule encoding fixed
2020-08-25 11:59:57 +05:30
Anupam K
28f4417fc5
fix: added filter show in website for filtering product
2020-08-25 08:59:37 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report
2020-08-24 20:23:19 +05:30
Marica
3e966d6889
Merge branch 'develop' into crm-reports
2020-08-24 19:42:18 +05:30
Shivam Mishra
7556517a4f
feat: validate if removed item attributes exist in variants ( #22911 )
...
* feat: validate if removed item attributes exist in variants
* Update erpnext/stock/doctype/item/item.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* Update erpnext/stock/doctype/item/item.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* refactor: smaller loop
Co-authored-by: marination <maricadsouza221197@gmail.com>
* feat: don't run validation for new entries
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: use tuple as is
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* refactor: error description
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* refactor: remove unused variable
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-24 19:37:09 +05:30
marination
8f452b8663
fix: Codacy and indicator message
2020-08-24 18:57:07 +05:30
marination
f49665077c
feat: Quoted Item Comparison Report Enhancements v2
2020-08-24 18:26:48 +05:30
Anupam K
64e84643fb
lost opportunity
2020-08-24 18:01:28 +05:30
rohitwaghchaure
cf4268e21a
Merge pull request #23116 from nabinhait/subcontracted-pr-gle
...
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-24 16:07:32 +05:30
Shivam Mishra
5d6b07558d
Merge branch 'develop' into iff-invoicing
2020-08-24 07:56:01 +00:00
rohitwaghchaure
554e2c2eb7
Merge pull request #23120 from deepeshgarg007/sle_cancel
...
fix: Reverse SLE not created for fraction qty or qty less than 1
2020-08-24 13:25:12 +05:30
rohitwaghchaure
7d8d26bbea
Merge pull request #23106 from ruchamahabal/add-pos-page
...
fix: POS page link not visible on Desk
2020-08-24 12:22:18 +05:30
Mangesh-Khairnar
e292fd6c58
feat: add integrations desk page
2020-08-24 00:45:13 +05:30
Deepesh Garg
8331a38ace
fix: Test Case for qty less than 1
2020-08-23 21:23:26 +05:30
Deepesh Garg
cb0bc2dcaf
fix: Negative SLE not created for fraction qty or qty less than 1
2020-08-23 20:43:50 +05:30
Suraj Shetty
99dfb9556d
refactor: Simplify code
2020-08-23 16:56:46 +05:30
Suraj Shetty
314551ceb2
refactor: Use right css clas name
2020-08-23 16:36:56 +05:30
Suraj Shetty
a43e760703
fix: Item dashboard style
2020-08-23 16:36:28 +05:30
Suraj Shetty
ecc7eedd10
fix: Update erpnext logo
2020-08-23 16:35:39 +05:30
Suraj Shetty
6f9f40992c
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-23 16:33:50 +05:30
Nabin Hait
337ee0a4bf
test: Test case for GLE in subcontracted PR if FG item rate is zero
2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-22 19:17:18 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable ( #23114 )
2020-08-22 12:31:06 +05:30
Deepesh Garg
1b760cb278
Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links
2020-08-21 12:36:21 +05:30
Saurabh
66ff5e5e77
Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1
...
fix: check setup complete flag instead setup page
2020-08-21 11:55:38 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies ( #23109 )
2020-08-20 19:39:10 +05:30
Deepesh Garg
cf3e482052
Merge pull request #23105 from deepeshgarg007/rcm_submit_v13
...
fix: Unable to submit reverse charge invoice
2020-08-20 19:35:25 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email ( #23097 )
...
* fix: Create Opoortunity without Default Company from Email
* fix: Add Prompt to Select Company
* Update communication.js
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-20 19:12:12 +05:30
Rucha Mahabal
4061186429
fix: POS page link not visible on Desk
2020-08-20 18:01:20 +05:30
Deepesh Garg
afd2dd3570
fix: Unable to submit reverse charge invoice
2020-08-20 16:52:52 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case ( #23102 )
2020-08-20 15:53:58 +05:30
Raffael Meyer
f0b9f660cd
Merge branch 'develop' into datev_refactor
2020-08-20 12:05:50 +02:00
Shivam Mishra
25ba271562
Merge branch 'develop' into fix-margin-for-filter
2020-08-20 08:59:04 +00:00
Shivam Mishra
d5971d3c59
Merge branch 'develop' into iff-invoicing
2020-08-20 08:16:22 +00:00
rohitwaghchaure
5f2463933a
Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty
...
feat(queries): sort warehouses based on item quantity in descending manner
2020-08-20 09:36:16 +05:30
Raffael Meyer
585f1f67b7
Merge branch 'develop' into navbar_links
2020-08-19 18:55:44 +02:00
Raffael Meyer
2c26144a6b
Update erpnext/patches/v13_0/add_standard_navbar_items.py
2020-08-19 18:55:06 +02:00
Deepesh Garg
cbedb3de3a
Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13
...
fix: Do not update total for RCM invoices if net taxes are zero
2020-08-19 20:19:06 +05:30
Deepesh Garg
8aed48fe31
fix: Do not update total for RCM invvoices if net taxes are zero
2020-08-19 18:59:27 +05:30
Rucha Mahabal
eed2a6340c
Merge branch 'develop' into fix-pos-print
2020-08-19 18:57:47 +05:30
marination
22d3729427
fix: Codacy
2020-08-19 15:42:40 +05:30
Deepesh Garg
aaeb3980bc
feat: JSON download for HSN wise outward summary
2020-08-19 15:13:30 +05:30
marination
698d983eef
fix: Item Tax Updation via Update Items in SO/PO
2020-08-19 14:59:46 +05:30
Diksha Jadhav
182ee5e7c1
feat(queries): sort warehouses based on item quantity
2020-08-19 14:04:34 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13
...
fix: Tax amounts in HSN Wise Outward summary
2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401
fix: Remove print statements
2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907
fix: Tax amounts in HSN Wise Outward summary
2020-08-19 11:41:33 +05:30
Rucha Mahabal
434bab8003
fix: Print Language for Customer not set for Print Receipt in POS
2020-08-19 01:00:59 +05:30
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices ( #23072 )
2020-08-18 19:32:52 +05:30
Deepesh Garg
9d60e48538
Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working
...
fix: profit and loss report not working
2020-08-18 17:03:10 +05:30
Rohit Waghchaure
310ade7282
profit and loss report not working
2020-08-18 16:07:24 +05:30
Marica
847343af86
Merge branch 'develop' into general-ledger-filters
2020-08-18 13:40:45 +05:30
Marica
12c68d0450
Merge branch 'develop' into credit-limit-email
2020-08-18 13:39:03 +05:30
Marica
2d767debf1
Merge branch 'develop' into shift_management
2020-08-18 13:27:15 +05:30
Michelle Alva
849b712770
fix: Change spelling of "Successful" ( #23063 )
...
Before:
Import Successfull
After:
Import Successful
2020-08-18 12:06:46 +05:30
Shivam Mishra
115ad3e99a
Merge branch 'develop' into iff-invoicing
2020-08-18 05:51:41 +00:00
Rucha Mahabal
035907a24f
fix: remove Request for Quotation link from Fiscal Year dashboard ( #23040 )
2020-08-18 10:57:10 +05:30
Glen Whitney
b2604d1f77
fix(General Ledger): include Accounting Dimension columns in report
...
Prior to this commit, custom Accounting Dimensions are not
(by default) shown or even considered in generating a General
Ledger report. Moreover, as they are not considered, they are
not used to distinguish GL Entry lines in the same voucher
with the same Account when the "Group By" value is
"Group by Voucher (Consolidated)". This situation leads to
lines with different values for the accounting dimension
to be ganged together in the General Ledger view of a Journal
entry, making the entry difficult for an accountant to read.
This commit alleviates the problem by adding a checkbox
to control whether Accounting Dimension columns are considered
in the General Ledger report. When they are considered, they
are displayed and also included in the key that distinguishes
lines in the "Group by Voucher (Consolidated)" mode.
Resolves #23033 .
2020-08-17 20:43:56 +00:00
Deepesh Garg
1067f7ed3e
fix: Price rule filtering in case of no doc
2020-08-17 23:47:58 +05:30
Deepesh Garg
38cabbd4b8
Merge pull request #23007 from prssanna/expense-claim-list-currency
...
fix: add company in list fields to fetch for Expense Claim
2020-08-17 23:07:51 +05:30
Deepesh Garg
aef5c4cb64
Merge pull request #23044 from frappe/sales-analytics
...
fix: Remove dependency of Sales Order in Sales Analytics
2020-08-17 23:00:49 +05:30
Shivam Mishra
eb832f6861
Merge branch 'develop' into iff-invoicing
2020-08-17 12:53:43 +00:00
Marica
4c1ea3e0e3
Merge branch 'develop' into credit-limit-email
2020-08-17 18:10:29 +05:30
Marica
0a926ee20d
Merge branch 'develop' into general-ledger-filters
2020-08-17 18:10:05 +05:30
Marica
11a167f8bb
Merge branch 'develop' into shift_management
2020-08-17 16:39:27 +05:30
marination
205df14a48
fix: Credit Limit Email not working
2020-08-17 16:23:44 +05:30
Anurag Mishra
df7b428331
fix: UI/UX Salary details and salary slip form cleanup ( #22536 )
...
* fix: UI/UX Salary details
* feat: salary slip form cleaup
* fix(test): set working days zero if salary slip is based on timesheet
* fix(revert): set working days zero if salary slip is based on timesheet
* fix: salary slip form cleanup
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-17 14:09:54 +05:30
Marica
39c97bfbe9
Merge branch 'develop' into shift_management
2020-08-17 13:46:51 +05:30
Anurag Mishra
13be09e883
Update update_start_end_date_for_old_shift_assignment.py
2020-08-17 13:43:33 +05:30
Afshan
084de5f0b2
fix: handled condition if staffing isn't created ( #22992 )
...
* fix: handled condition if staffing isn't created
* style: reformated code for redability
* Update erpnext/hr/doctype/job_offer/job_offer.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-17 13:14:09 +05:30
marination
eb241c6c42
fix: General Ledger filter validation
2020-08-17 12:57:56 +05:30
Anupam K
d7b69e57ae
fix: deleting unused Stock Entry Type
2020-08-17 11:20:56 +05:30
Afshan
5b45961b9d
fix: the JSON object must be str, bytes or bytearray, not "list" ( #23047 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-17 10:51:53 +05:30
Deepesh Garg
e1e847a3f7
feat: Enhancement in Loan Topups
2020-08-16 20:57:39 +05:30
Deepesh Garg
a2249e013d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes
2020-08-15 18:28:04 +05:30
michellealva
e69b2e0da1
fix: Remove dependency of Sales Order in Sales Analytics
2020-08-15 10:16:26 +05:30
Deepesh Garg
d9accededa
fix: filter pricing rules based on condition
2020-08-14 22:36:01 +05:30
Shivam Mishra
fe57ed629e
Merge branch 'develop' into iff-invoicing
2020-08-14 14:31:31 +00:00
Shivam Mishra
736aee886e
Merge branch 'develop' into support-search
2020-08-14 13:36:59 +00:00
Rucha Mahabal
5fb0e7184e
fix: list index out of range error while setting POS payment mode ( #23018 )
2020-08-14 17:11:39 +05:30
Suraj Shetty
cab5918244
Merge branch 'develop' into HR-fix
2020-08-14 16:12:28 +05:30
Shivam Mishra
3daa9de998
feat: add email option to field email_id
2020-08-14 13:46:58 +05:30
Shivam Mishra
6b68eaad1e
feat: use email template for membership acknowledgement
2020-08-14 13:46:58 +05:30
Shivam Mishra
b4d3666e69
feat: show send acknowledgement button if enabled in settings
2020-08-14 13:46:58 +05:30
Shivam Mishra
e4c58c37c8
feat: allow member creation via API
2020-08-14 13:46:58 +05:30
Shivam Mishra
98bcedd09c
feat: create member if not already exists
2020-08-14 13:46:58 +05:30
Shivam Mishra
d7139bbd43
fix: type error
2020-08-14 13:46:58 +05:30
Shivam Mishra
87ddec069e
refactor: try block across the function
2020-08-14 13:46:58 +05:30
Shivam Mishra
6fbe9b5404
fix: remove payload
2020-08-14 13:46:58 +05:30
Shivam Mishra
733bde31c9
fix: doctype name in patch
2020-08-14 13:46:58 +05:30
Shivam Mishra
3a67a78ece
feat: add custom buttons for invoice and email
2020-08-14 13:46:58 +05:30
Shivam Mishra
8e0314e7f6
feat: separate invoice generation and email
2020-08-14 13:46:58 +05:30
Shivam Mishra
c8d9e7f77b
feat: add message field
2020-08-14 13:46:58 +05:30
Shivam Mishra
1678eb9b50
feat: drop payload column
2020-08-14 13:46:58 +05:30
Shivam Mishra
62e344188a
feat: update settings and link filters
2020-08-14 13:46:32 +05:30
Shivam Mishra
15340e0c7f
feat: send invoice via email
2020-08-14 13:46:32 +05:30
Shivam Mishra
811ac909f9
feat: add auto invoice creation fields and controllers
2020-08-14 13:46:32 +05:30
Shivam Mishra
96dc67c35e
feat: add copy button and docs link
2020-08-14 13:46:32 +05:30
Shivam Mishra
3a1868dae8
feat: add item field
2020-08-14 13:46:32 +05:30
Shivam Mishra
a16b24d50a
feat: add enable or disable invoicing and print format field
2020-08-14 13:46:32 +05:30
Anurag Mishra
759632c025
fix: requested Changes
2020-08-14 12:26:04 +05:30
Anurag Mishra
6f1579da1f
Merge branch 'develop' into shift_management
2020-08-14 12:11:41 +05:30
Deepesh Garg
8ca57eb5dd
Merge pull request #23022 from marination/loan-amount
...
fix: Validate or Set Loan Amount first
2020-08-13 19:53:09 +05:30
Afshan
d7d92c520e
fix: removed code relating to standard working hours ( #23009 )
2020-08-13 19:40:09 +05:30
Deepesh Garg
1151f888ba
fix: Set pledge amount before setting loan amount
2020-08-13 18:52:23 +05:30
bhavesh95863
a647bef682
fix: warehouse mandatory even update stock uncheck ( #23023 )
2020-08-13 17:41:55 +05:30
Anupam K
b3bd780d46
fix: codasy dix
2020-08-13 17:07:15 +05:30
Anurag Mishra
f096ba4998
patch: Old Shift Assignment
2020-08-13 14:18:48 +05:30
Anurag Mishra
c2710e05ce
fix: showing on_going shift on calendar
2020-08-13 14:17:47 +05:30
Anurag Mishra
74f0a1ab7c
fix: changes Requested
2020-08-13 14:17:47 +05:30
Anurag Mishra
00a8081aba
Fix: button label
2020-08-13 14:17:47 +05:30
Anurag Mishra
dcf598dc2d
Fix: requested Changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
d5c921e358
Fix: Requested Changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
b48110caf1
Update erpnext/hr/doctype/shift_assignment/shift_assignment.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-13 14:17:47 +05:30
Anurag Mishra
3aa1101d5e
fix: requested changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
17e6d0918b
feat: Employee level Shift Request Approver
2020-08-13 14:17:47 +05:30
Anurag Mishra
43ba7dd4c8
feat: don't allow to request for default shift
2020-08-13 14:17:47 +05:30
Anurag Mishra
feef4a6c1e
test: employee checkin
2020-08-13 14:17:47 +05:30
Anurag Mishra
b3e00de0ae
refactor: Shift Request
2020-08-13 14:17:47 +05:30
Anurag Mishra
a6ec7e31d2
test: shift assignment
2020-08-13 14:17:47 +05:30
Anurag Mishra
dd46d19765
feat: map event calendar to show ongoing shift assignment and fixed period assigment
2020-08-13 14:17:47 +05:30
Anurag Mishra
afa98bb39b
feat: Assign shift for period or create ongoing assignment
2020-08-13 14:17:47 +05:30
Abhishek Balam
a25760046f
fix: condition syntax validation readded, fetch item details if condition not met ignoring rule
2020-08-13 13:22:58 +05:30
marination
8264fcd0a5
fix: Only validate repayment if term loan
2020-08-13 12:47:34 +05:30
Abhishek Balam
487aa30aef
fix: eval fail message fix
2020-08-13 12:19:34 +05:30
marination
6988fbb82d
fix: Validate or Set Loan Amount first
2020-08-13 12:17:13 +05:30
Deepesh Garg
ca898c6da3
fix: Condition fix
2020-08-13 11:54:18 +05:30
Deepesh Garg
cbde04d3da
fix: Pass doc instead of args
2020-08-13 11:47:41 +05:30
prssanna
bfb219612e
feat: enable total row in Gross Profit Report
2020-08-13 11:34:05 +05:30
Anupam Kumar
e447c79f9d
fix: Quotation lost reason options fix ( #22814 )
...
* adding patch and lost reason child tables
* fix: conflict resolved
2020-08-13 09:20:36 +05:30
Saqib
c7614174d0
fix: cannot change customer fields if credit exhausted ( #22838 )
...
* fix: cannot change customer fields if credit exhausted
* fix: order based on company
* fix: sort current limits w.r.t company before compare
* fix: CustomerCreditLimit Object is not subscriptable
2020-08-13 09:18:59 +05:30
Nabin Hait
e2ee455acc
fix: Calculate taxes if tax is based on item quantity
2020-08-12 20:58:03 +05:30
Abhishek Balam
fdfab03c11
feat: add condition field in pricing rule
2020-08-12 20:33:54 +05:30
Raffael Meyer
94308fc107
Merge branch 'develop' into barredterra-patch-1
2020-08-12 16:14:55 +02:00
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu ( #22988 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-12 19:19:03 +05:30
Rucha Mahabal
cd5821e00a
Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status
...
fix: don't set asset maintenance log status as Overdue when Completed or Cancelled
2020-08-12 19:17:33 +05:30
Deepesh Garg
617027c6ca
Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links
2020-08-12 18:39:20 +05:30
Rucha Mahabal
517a6d0054
fix: set draft indicators for Asset Maintenance Log listview
2020-08-12 18:01:45 +05:30
Rucha Mahabal
691ec1bd27
fix: don't set maintenance log status as Overdue when Completed or Cancelled
2020-08-12 18:01:07 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement ( #22671 )
...
* feat: send to warehouse
* adding warehouse validation
* fix: review changes
* fix: review changes
* stock entry enhancement
* fix: review changes
2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry ( #22929 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-12 14:33:30 +05:30
Marica
846771cb29
Merge branch 'develop' into item-image-alt
2020-08-12 13:37:19 +05:30
Deepesh Garg
1d5ab618d2
Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity
...
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 22:05:02 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon"
2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 20:34:57 +05:30
Shivam Mishra
1679c7af88
Merge branch 'develop' into support-search
2020-08-11 14:54:10 +00:00
Afshan
ba33900712
Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO
2020-08-11 20:17:05 +05:30
Afshan
b5b2586968
fix: referencing frm
2020-08-11 20:15:57 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt
2020-08-11 14:45:55 +00:00
Shivam Mishra
ccdaf3da66
Merge branch 'develop' into fix-margin-for-filter
2020-08-11 14:41:29 +00:00
Deepesh Garg
ca9038feb7
Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity
...
fix(CRM): Change 'Source' section name to 'More Information' in Opportunity
2020-08-11 18:26:09 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. ( #22991 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 18:04:42 +05:30
Deepesh Garg
2633e292a5
fix: Is Secured Loan check mapping
2020-08-11 18:03:28 +05:30
Abhishek Balam
d0ae92d4bd
fix: moved company field, renamed to 'More Information'
2020-08-11 17:39:17 +05:30
prssanna
5a7618d8ec
fix: add company in list fields to fetch for Expense Claim
2020-08-11 16:50:31 +05:30
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
Abhishek Balam
9f6d114265
fix: Change Source section name to 'Company Information'
2020-08-11 16:16:05 +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
Deepesh Garg
145b80b11c
Merge pull request #22987 from frappe/fix-company-field
...
fix: Consistent capitalization
2020-08-11 16:09:27 +05:30
Deepesh Garg
2621016884
fix: Allocated advance amount for multi-currency payment ( #22923 )
...
* fix: Allocated advance amount for multicurrency payment
* fix: Get grand total based on party currency
* fix: Remove unwanted code
2020-08-11 16:06:13 +05:30
Abhishek Balam
ef3b82dae2
fix(CRM): Move Source section above Follow Up section In Opportunity ( #22974 )
...
* fix: move source section above follow up
* fix: only moving source field to 1st section
2020-08-11 16:05:02 +05:30
Shivam Mishra
3325be1d87
fix: spacing for slideshow ( #22996 )
2020-08-11 16:03:46 +05:30
Deepesh Garg
285e059394
Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted
...
fix(CRM): Change Opportunity to 'Converted' when Sales Order is created
2020-08-11 16:00:16 +05:30
Abhishek Balam
c992616d35
fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order
2020-08-11 15:22:54 +05:30
Shivam Mishra
c798c6abbd
Merge branch 'develop' into fix-margin-for-filter
2020-08-11 09:11:30 +00:00
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
Shivam Mishra
49dd8782fd
fix: margin overflow cutting the focus state
2020-08-11 14:39:04 +05:30
Rucha Mahabal
19b51762ef
fix: escape fields for Payroll Entry ( #22994 )
2020-08-11 13:12:00 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field
2020-08-11 10:22:32 +05:30
Saurabh
58d05ac0e0
fix: check setup complete flag insted setup page
2020-08-10 19:36:45 +05:30
Jai Chavan
dbbb864ba5
fix: Consistent capitalization
2020-08-10 16:55:03 +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
Saurabh
2547b7479e
Merge pull request #22975 from nextchamp-saqib/pos-fixes-1
...
fix: [pos] minor bugs
2020-08-10 14:50:53 +05:30
Marica
0fcb05a3aa
fix: Misleading filters on Item tax Template Link field ( #22918 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 14:48:13 +05:30
Saqib Ansari
f1091534cd
fix: [pos] minor bugs
2020-08-10 14:45:58 +05:30
Marica
42fbdc09f8
Merge branch 'develop' into opportunity-from-email
2020-08-10 13:48:43 +05:30
Anoop
d3d3db654e
fix: Inpatient Record - Transfer check-in time validation ( #22958 )
...
* fix: inpatient transfer should not allow future checkin time
* Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js
Error message corrected
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 13:21:12 +05:30
Deepesh Garg
d626e3bd2e
Merge branch 'develop' into billing_address_fetch
2020-08-10 12:57:12 +05:30
Shivam Mishra
ded9f41cce
refactor: update confusing label
2020-08-10 12:45:07 +05:30
marination
a07973cfa5
fix: Creating opportunity from email
2020-08-10 12:39:42 +05:30
Anurag Mishra
95984fd921
fix: Not able to cancel application,allocation nad encashments
2020-08-10 12:36:00 +05:30
Rucha Mahabal
97ecf52d6f
fix: failing Fees test
2020-08-10 12:13:35 +05:30
Prssanna Desai
5c0439f768
fix: set correct default value from from date in downtime analysis report ( #22903 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 11:12:52 +05:30
Deepesh Garg
bc8a281f83
fix: Subscripition link in Customer dashboard ( #22960 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 11:00:08 +05:30
Deepesh Garg
41a4999711
Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix
...
fix: cannot submit value adjustment with custom dimension
2020-08-10 10:12:41 +05:30
Deepesh Garg
097d89f550
Merge pull request #22946 from deepeshgarg007/gst_export_wopay
...
fix: GSTR 1 report for exports without payment of Tax
2020-08-10 09:56:12 +05:30
Anupam K
d01caac852
report lead detail
2020-08-10 09:39:58 +05:30
Raffael Meyer
821eeb9852
fix(membership): currency should be a link
2020-08-09 14:07:32 +02:00
Mangesh-Khairnar
a53f15ca35
fix: remove mentions of display items in stock ( #22963 )
2020-08-09 13:12:47 +05:30
Deepesh Garg
7882c70244
Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13
...
fix: Taxable value for RCM
2020-08-08 22:34:36 +05:30
Deepesh Garg
d4ecf426b7
fix: Place of supply fix
2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0
fix: Taxable value for RCM
2020-08-08 22:28:13 +05:30
Deepesh Garg
af1f46f2d9
fix: Add default billing address for purchase documents
2020-08-07 19:44:20 +05:30
Deepesh Garg
72fc188706
Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes
...
fix: Description for fields and patch for old loans
2020-08-07 17:08:31 +05:30
Deepesh Garg
bad269c354
fix: Parent income account check
2020-08-07 16:21:41 +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
Deepesh Garg
ab611d5fd8
fix: GSTR 1 report for exports without payment of Tax
2020-08-07 14:47:40 +05:30
Shivam Mishra
b7a24ad95b
Merge branch 'develop' into item-image-alt
2020-08-07 09:15:00 +00:00
Shivam Mishra
b1f8859121
feat: add alt value in product page
2020-08-07 14:38:40 +05:30
Shivam Mishra
a0954e66a8
feat: add image alt argument for product_image macros
2020-08-07 14:34:54 +05:30
Shivam Mishra
ba4c4f107e
feat: add image alt field in items
2020-08-07 14:34:28 +05:30
Deepesh Garg
b98088bb01
Merge branch 'develop' into loan_patch_and_fixes
2020-08-07 13:27:40 +05:30
Anupam K
9d82953242
fix: Opportunity Status fix
2020-08-06 23:58:56 +05:30
Deepesh Garg
a306af8c08
fix: Add help link in navbar settings
2020-08-06 20:52:02 +05:30
Shivam Mishra
124eabaac8
Merge branch 'develop' into barredterra-patch-1
2020-08-06 14:16:48 +00:00
Rucha Mahabal
a78336e77d
fix: remove patch for retaining permissions for Video DocType ( #22932 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-06 19:01:42 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts
2020-08-06 15:09:22 +02:00
marination
63513f1b14
fix: Show Add to Cart Button anyway
...
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
2020-08-06 18:22:28 +05:30
marination
ccf44a1bfd
fix: product action instead of info
2020-08-06 17:34:38 +05:30
Shivam Mishra
01f664a88f
fix: handle product_info null
2020-08-06 17:24:02 +05:30
Shivam Mishra
33a5fdfb78
fix: unbound error in product configurator
2020-08-06 17:23:51 +05:30
Afshan
085061fa21
fix: show or hide section or attributes depending on other attributes… ( #22861 )
...
* fix: show or hide section or attributes depending on other attributes for better UI
* Update erpnext/stock/doctype/item/item.js
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: made has_variants checkbox to read_only if stock_exists
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-06 14:36:34 +05:30
Marica
1afe177a4f
Merge branch 'develop' into education-dashboard
2020-08-06 14:12:00 +05:30
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
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' ( #22915 )
2020-08-05 16:47:41 +05:30
Rucha Mahabal
f9143e9bb0
Merge branch 'develop' into education-dashboard
2020-08-05 16:28:14 +05:30
Rucha Mahabal
8edace1a58
fix: covert Program wise Fee Collection to a Script Report
2020-08-05 16:24:21 +05:30
Rucha Mahabal
d67c2ea0d4
fix: make program field mandatory in Fees
2020-08-05 14:13:14 +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
Marica
e211bb7a53
fix: Reposition description in Warehouse ( #22895 )
2020-08-03 20:40:09 +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
101fe2b769
fix: Assessment Result child table not visible when accessed via dashboard ( #22880 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-03 19:42:24 +05:30
Anupam Kumar
1895e9b89a
fix: Shopping cart issue v13 ( #22868 )
...
* refactoring shopping cart settings
* adding column_break in shopping cart settings
* fix: mandatory depend on fix company
* fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.
2020-08-03 18:50:11 +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
Marica
dd97524db5
fix: Misleading description in Warehouse ( #22877 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 14:55:40 +05:30
Prssanna Desai
1dfd9fd756
fix: check if row['delay'] exists ( #22889 )
2020-08-03 14:48:45 +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
Wolfram Schmidt
5e438cc853
Update lead_source.json ( #22872 )
...
Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors.
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 12:46:50 +05:30
Shivam Mishra
de80553d89
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-03 12:34:05 +05:30
Nabin Hait
9cc2d340ba
Reset home page based on product settings ( #22875 )
2020-08-03 10:43:47 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings ( #22873 )
2020-08-03 09:33:31 +05:30
Anurag Mishra
ba52dd8ba6
fix: minor payroll_dashboard fixes ( #22832 )
...
* fix: minor payroll_dashboard fixes
* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 08:57:49 +05:30
Deepesh Garg
4104887abb
fix: fieldname in filter
2020-08-02 18:23:54 +05:30
marination
e3495116dd
chore: Error Logging and exception hnadling on connection failure
2020-08-02 17:13:34 +05:30
Deepesh Garg
d909669a18
fix: Test cases
2020-08-02 17:00:53 +05:30
marination
c16ace6732
fix: Codacy
2020-08-02 16:43:15 +05:30
marination
ccf4ab9f85
chore: Added Interactions Report and behaviour fixes
...
- Youtube Interactions Report with Chart and Summary
- Statistics change in doc on refresh and get updated in db as well
2020-08-02 16:26:36 +05:30
marination
ddc2be36ab
Merge branch 'develop' of https://github.com/frappe/erpnext into youtube-analytics
2020-08-02 05:37:30 +05:30
marination
d4817c8685
feat: Track Youtube interactions via Video DocType
2020-08-02 05:35:45 +05:30
Deepesh Garg
b9dc21129c
fix: Loan Seurity shortfall calculation fixes
2020-08-01 22:51:40 +05:30
Deepesh Garg
946e106714
Merge pull request #22863 from deepeshgarg007/taxjar_fix
...
fix: Import pycountry and taxjar only if taxjar is enabled
2020-08-01 13:52:40 +05:30
Deepesh Garg
dcb462f305
fix: Import pycountry and taxjar only if taxjar is enabled
2020-08-01 13:47:09 +05:30
marination
d36df92750
fix: Codacy and repositioned Returned Qty in DN Item
2020-07-31 20:22:55 +05:30
marination
e4dc7642bc
Merge branch 'pr-dn-return' of https://github.com/marination/erpnext into pr-dn-return
2020-07-31 20:01:59 +05:30
marination
ba37fe796c
chore: Delivery Note Return status
2020-07-31 20:01:06 +05:30
Anurag Mishra
2a4c90302b
fix: minor recritment analytics fixes ( #22830 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-31 17:59:30 +05:30
Marica
8058a81dc1
Merge branch 'develop' into pr-dn-return
2020-07-31 16:02:17 +05:30
marination
66069df020
feat: Return tracking in PR/DN
2020-07-31 15:54:05 +05:30
Marica
cf00ee49ec
fix: PO/SO view title ( #22858 )
2020-07-31 15:14:50 +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
Shivam Mishra
11111cd9a9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-07-30 21:29:02 +05:30
Nabin Hait
9837285bf1
fix: Ignore cancelled gl entries to get account balance
2020-07-30 20:52:20 +05:30
Rucha Mahabal
b6675f8dd4
feat: Lab Test Report Summary and Chart
2020-07-30 19:33:08 +05:30
Rucha Mahabal
c5ccf38cdf
refactor: Lab Test Report
2020-07-30 18:56:16 +05:30
Saurabh
a14618efe4
fix: validate theme_scss attribute
2020-07-30 17:22:29 +05:30
Rucha Mahabal
ca1b389c99
fix: validate negative quantity for sample collection
2020-07-30 16:58:19 +05:30
Rucha Mahabal
fa2c20ea9e
chore: Sample Collection Form clean-up
2020-07-30 16:56:11 +05:30
Rucha Mahabal
9087689d90
fix: subtitle for onboarding
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-30 16:10:05 +05:30
Rucha Mahabal
afa001a1d1
fix: code clean-up
2020-07-30 15:25:04 +05:30
Rucha Mahabal
73edb12ab3
fix: msgprint for sample collection doc created on Lab Test creation
2020-07-30 14:50:30 +05:30
Rucha Mahabal
c33703d54c
fix: move result value validations to server side
2020-07-30 14:25:40 +05:30
Rucha Mahabal
b00f870c77
fix: Lab Test Completed status not visible in list view
2020-07-30 13:49:13 +05:30
Rucha Mahabal
621529adfb
fix: unlink item from healthcare service unit type ( #22828 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-30 13:18:41 +05:30
Marica
c0ea2bc804
Merge branch 'develop' into validate-patient-transfer-time
2020-07-30 13:10:19 +05:30
Saqib
031768f49d
chore: asset form reorder ( #22833 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-30 12:40:53 +05:30
Rucha Mahabal
ff0b9bffcf
feat: added dashboard for Lab Test Template
2020-07-30 12:16:56 +05:30
Rucha Mahabal
440c752529
chore: Lab Test Template form clean-up
2020-07-30 12:16:18 +05:30
Anupam K
6bab21483c
report lost opportunity
2020-07-30 00:41:06 +05:30
barredterra
517df5fb0e
fix: codacy (again)
2020-07-29 18:16:49 +02:00
barredterra
b719378ee5
fix: codacy
2020-07-29 18:11:04 +02:00
Shivam Mishra
5b056988a6
Merge branch 'develop' of https://github.com/frappe/erpnext into support-search
2020-07-29 21:16:35 +05:30
barredterra
dec2c90866
refactor: move datev-specific stuff to utils
2020-07-29 17:14:23 +02:00
Prssanna Desai
9e81bb9a11
fix: add range filters to oldest items chart ( #22842 )
2020-07-29 17:28:30 +05:30
Anupam K
61bfb8c817
Merge branch 'develop' of https://github.com/frappe/erpnext into crm-reports
2020-07-29 15:45:55 +05:30
Saqib Ansari
8cfa00920e
fix: cannot submit value adjustment with custom dimension
2020-07-29 15:24:03 +05:30
anoop
5903002039
fix: exclude Cancelled appointments while Get Items in Sales Invoice
2020-07-28 21:15:54 +05:30
Rucha Mahabal
a695971596
fix: show the standard validation message
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-28 20:15:29 +05:30
Rucha Mahabal
7cbc7946af
fix: validate check out and check in time for inpatient occupancy
2020-07-28 14:11:12 +05:30
Marica
c1e46d8131
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-28 12:29:47 +05:30
Rucha Mahabal
81ae6c3240
fix: reload HR Settings to fix failing setup ( #22802 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-28 12:27:41 +05:30
Nabin Hait
701474cbaa
fix: POS patch fix ( #22818 )
2020-07-28 09:11:37 +05:30
Shivam Mishra
48be7d37b8
fix: add order_by explicitly for lead ( #22820 )
2020-07-28 09:00:09 +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
Rucha Mahabal
fdcaecb58c
Merge branch 'develop' into education-dashboard
2020-07-27 22:23:08 +05:30
Rucha Mahabal
9a2cc74414
feat: onboarding for Education module
2020-07-27 21:33:00 +05:30
Anupam K
9ceeefbd2b
refactor: CRM Reports
2020-07-27 19:56:07 +05:30
Rucha Mahabal
6c11f26a11
feat: Education dashboard charts and number cards
2020-07-27 18:50:04 +05:30
Rucha Mahabal
49140ccbfd
feat: Program wise Fee Collection Query Report
2020-07-27 18:48:15 +05:30
Shivam Mishra
97a316c09a
feat: add create customer button to member
2020-07-27 15:27:09 +05:30
Shivam Mishra
9e3776e001
feat: improve webhook logging
2020-07-27 14:26:37 +05:30
Shivam Mishra
e43d362d53
feat: verbose logging for verification
2020-07-27 14:19:36 +05:30
Shivam Mishra
4e40b9bdbe
feat: log everything
2020-07-27 14:19:36 +05:30
bhavesh95863
bcb49e59e7
fix: Add missing translation function ( #22813 )
...
* fix: Add missing translation function
Add missing translation function
* fix: Add missing function for translation
* fix: Add missing translation function
* fix: Add missing translation function
2020-07-26 14:02:16 +05:30
Anupam K
8718daa11e
Adding formatter in budget variance report
2020-07-25 23:56:11 +05:30
Deepesh Garg
b2fccc1d05
Merge pull request #22800 from ruchamahabal/fix-assessment-report
...
fix(Education): course wise assessment report labels
2020-07-24 19:12:24 +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
Rucha Mahabal
860a824a7c
fix: change label for final grade
2020-07-24 14:32:36 +05:30
Rucha Mahabal
27835b7789
fix: add labels to chart datasets in course wise assessment
2020-07-24 14:07:00 +05:30
Rucha Mahabal
1010feefe0
feat: Patient Progress Page ( #22474 )
...
* feat: add patient progress page
* feat: patient progress sidebar
* feat: Patient Progress Charts
* feat: set up sidebar links
* feat: added heatmap chart for patient interactions
* fix: styles
* fix: add markers for max score in assessment charts
* fix(style): mobile view css
* fix: heatmap and percentage chart filters
* feat: add time span filters to line charts
* fix: make date fields mandatory in healthcare doctypes for better analytics
* fix: title and filter styles
* fix: handle null state for charts
* feat: add Patient Progress Page to desk
* feat: add date range filter to all charts
* fix: code clean-up
* fix: assign roles for Patient Progress Page
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-24 10:49:04 +05:30
Afshan
ecb1460440
fix: update the project after task deletion so that the % completed s… ( #22591 )
...
* fix: update the project after task deletion so that the % completed shows correct value
* fix: patch to correct % complete of previous projects
* fix: for version-13
* fix: removed patch from v13
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-24 10:48:16 +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
Nabin Hait
6bbd4d0c14
fix: Other charges on income tax ( #22797 )
2020-07-24 09:20:48 +05:30
Anupam K
5d5f026a0d
fix: Target variance report signs
2020-07-24 02:32:45 +05:30
Deepesh Garg
7cb1613173
Merge pull request #22622 from AfshanKhan/add-age-range-in-stock-ageing
...
feat: added range for age in stock ageing
2020-07-23 21:56:45 +05:30
Afshan
73b86d241c
fix: conversion to float
2020-07-23 21:09:27 +05:30
Rucha Mahabal
89f9346185
fix(Education): descriptions not copied while creating fees from fee structure ( #22792 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-07-23 20:59:56 +05:30
Deepesh Garg
9843e9f917
fix: Expnese claim outstanding while making payment entry ( #22735 )
2020-07-23 20:58:57 +05:30
Afshan
13d2a34548
Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
...
Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
2020-07-23 20:35:21 +05:30
Afshan
7965f655a2
Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
...
Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
2020-07-23 20:33:43 +05:30
Afshan
775fbe74c5
fix: fixed the logic
2020-07-23 20:33:07 +05:30
Sun Howwrongbum
9bd5f1e4b0
fix: incorrect available_qty being set ( #22539 )
...
* fix: incorrect available_qty being set
* style: descriptive variables
2020-07-23 20:06:26 +05:30
Afshan
aa94abf601
fix: asset dashboard report changes ( #22759 )
...
* fix: asset dashboard report changes
* fix: moved static filters to dynamic filters
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 19:12:38 +05:30
Abhishek Balam
cb45836cda
feat(CRM): Email Group Option In Email Campaign ( #22731 )
...
* new parent updating logic, made requested changes
* feat: adding Email Group option in Email Campaign
* fix: inv commas
2020-07-23 19:07:11 +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
Deepesh Garg
718870f4a2
Merge pull request #22736 from Thunderbottom/set-homepage
...
fix: reset homepage to home after unchecking products page
2020-07-23 18:53:37 +05:30
Nabin Hait
9389b3625a
Merge branch 'develop' into add-age-range-in-stock-ageing
2020-07-23 18:53:00 +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
Nabin Hait
8712ac6d39
fix: Job offer is mandatory for employee onboarding ( #22791 )
2020-07-23 18:09:35 +05:30
Marica
3c8c346227
fix: Pick List empty table and Serial-Batch items handling ( #22426 )
...
* chore: Pick List empty table and serial-batch items handling
* fix: Remove console statement
* chore: Added tests for batched and batched-serialised item
2020-07-23 17:52:06 +05:30
Afshan
55125fbe4e
fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options ( #22744 )
2020-07-23 17:44:38 +05:30
Shivam Mishra
b6fb13258f
feat: move financial statement switcher to page toolbar
2020-07-23 17:02:32 +05:30
Shivam Mishra
f59d927f73
feat: update summary items
2020-07-23 17:02:32 +05:30
Shivam Mishra
840550e25f
refactor: change sequence for profit and loss statement
2020-07-23 17:02:32 +05:30
Shivam Mishra
be5e129259
feat: update icons for erpnext settings shortcuts
2020-07-23 17:02:32 +05:30
Shivam Mishra
1358efe896
feat: update icons
2020-07-23 17:02:32 +05:30
Rucha Mahabal
833682b03d
feat(Education): Student Attendance and Leave Enhancements ( #22623 )
...
* feat: make Student Attendance doctype submittable
* feat: add attendance related fields in Student Leave Application
* feat: update Attendance records on Leave Application submission
* refactor: better error messages and ORM queries
* fix: show present only for leave applications with mark_as_present enabled in attendance reports
* test: Student Leave Application
* fix: filter for attendance records
* fix: codacy issues
2020-07-23 16:40:07 +05:30
Anupam Kumar
04a76285e2
fix: Unable to change link from new lead to existing customer ( #22787 )
...
* Unable to change link from new lead to existing customer
* Unable to change link from new lead to existing customer
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-07-23 16:30:56 +05:30
Anupam Kumar
7137b0b670
refactor: shopping cart ( #22617 )
...
* refactoring shopping cart settings
* adding column_break in shopping cart settings
2020-07-23 15:58:47 +05:30
Rucha Mahabal
5142fc9365
feat(Education): added form dashboards and refactored custom buttons for better linking ( #22727 )
...
* feat: add form dashboards to all forms in Education Module
* feat: Add Course to Programs button in Course DocType
* refactor: custom buttons in Education module forms
* feat: buttons to add topic, article, quiz to their respective parent doctypes
* feat: add charts to form dashboards
* fix: code cleanup
2020-07-23 15:57:27 +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
Afshan
767ee1cdb8
fix: logic to get other items also other than just 1st one
2020-07-23 15:39:27 +05:30
Anoop
23481cc484
feat: Laboratory Module Enhancements ( #22416 )
...
* feat: option to add organism count in descriptive tests
print format to accommodate descriptive test changes
fix: refactoring, clean up wip
* lab test - result based on secondary uom, result format options
lab test print - consider result format options, result legend and worksheet instructions
* feat: option to allow results blank in lab test if configured via lab test template
* fix: rename child doctypes, rename related links
* fix: field display depends on, cleanup - rename fields and variables
* fix: get from encounter popup layout, code cleanup and minor fixes
* fix: sms send dialog bug
* fix: lab test get from encounter html class name typo corrected
* fix: lab test organisms depends on condition
* fix: reorder fields - depends on fields brought together
* fix: PR review feedback, removed : separator, result formatting applied to result UOM
* fix: child table js removed
* fix: internal field require_result_value hidden, secondary uom result field type set to data
* fix: Use ORM methods instead of db.sql, code cleanup, style
* fix: create item price for lab test template if billable, code cleanup
* fix: patch rename doctypes before fields, deleted renamed child doctypes
* fix: secondary uom result calc - warn user if calculation fails
* fix: patch to insert entries into renamed child tables
* fix: codacy issues
* fix: patch duplicate error as items are already migrated in v12 migrate
organisms child table field name updated
* fix: patch a bit lenghty, added comments
* fix: patch
* fix: require_result_value flag marked hidden
* fix: code cleanup-up
* fix: patch - lab_test rename field, lab_test_group_template select option corrected
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-23 15:00:54 +05:30
Anurag Mishra
453325fbc9
fix: job applicant fixes ( #22448 )
...
* fix(validation): not two job offer should be allowed for single job_applicant
* fix: don't allow to create employee_onboarding without job offer
* fix: server side validation
* fix: requested changes
2020-07-23 12:22:42 +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
Anurag Mishra
9aa0602065
Fix: HR and Payroll Dashboard ( #22771 )
...
* Fix: HR and Payroll Dashboard
* fix: requested changes
2020-07-23 12:10:48 +05:30
Chinmay D. Pai
3e503e4404
chore: do not reset homepage through hooks
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-23 12:06:19 +05:30
Anurag Mishra
ce5b490f66
feat : Recruitment analytics ( #21732 )
...
* feat: recruitment_anlytics
* fix: filters
* feat: added missing column designation
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:04:58 +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
Anupam Kumar
a18f2ec23e
fix: setting filter for project in kanban board ( #22717 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 11:09:17 +05:30
Marica
43b4b1cb55
chore: Export Buying Dashboard ( #22767 )
...
* chore: Export Buying Dashboard
* fix: Use Timespan instead of Between for static filters
2020-07-23 11:08:49 +05:30
Anupam Kumar
4a5fc23d5c
Export Project dashboard ( #22782 )
2020-07-23 11:07:56 +05:30
Marica
f207f48a67
Merge branch 'develop' into change-video-doctype-module
2020-07-22 21:22:39 +05:30
Prssanna Desai
fb89906354
fix: pass date range instead of from date ( #22114 )
...
* fix: pass date range instead of from date
* fix: escape inputs
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-07-22 20:17:50 +05:30
Marica
3994aa8b06
fix: Same Contact name for different parties at Portal Login ( #22715 )
2020-07-22 19:49:54 +05:30
Rucha Mahabal
f4a7adbf2e
refactor: Education Desk Page
2020-07-22 18:59:04 +05:30
Marica
2ee64ceaff
Merge branch 'develop' into club-mr-column
2020-07-22 18:52:10 +05:30
Deepesh Garg
c88a3b4bf9
Merge pull request #22765 from anupamvs/rfq
...
feat: Provision to make RFQ against Opportunity
2020-07-22 18:28:48 +05:30
rohitwaghchaure
d45ff31ff0
fix: incorrect stock after merging the items ( #22526 )
...
* fix: incorrect stock after merging items
* fix: Readability fix
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-22 18:24:01 +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
Anupam Kumar
3e4b5e5496
fix: item-wise sales history report ( #22783 )
2020-07-22 18:17:58 +05:30
Anupam Kumar
e519334dfc
feat: Export CRM dashboard ( #22778 )
...
* feat: Exported CRM dashboard
* feat: Export CRM Dashboard
* fix: adding company in all dashboard and number card
2020-07-22 18:16:57 +05:30
Anupam K
5bd0b93acf
fix: cur_frm -> frm
2020-07-22 18:10:57 +05:30
Anupam Kumar
93afbe143b
feat: Export Selling Dashboard ( #22776 )
...
* feat:Export Stock Dashboard
* Export Selling Dashboard
* Export Selling Dashboard
2020-07-22 18:07:39 +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
Prssanna Desai
f098221550
feat: Exported manufacturing dashboard ( #22626 )
...
* feat: exported Manufacturing Dashboard
* fix: update use_report_chart fieldname
* fix: add dynamic filter for company in Produced Quantity chart
2020-07-22 16:58:17 +05:30
sahil28297
3d3c922d7f
fix(patch): handle duplicate entry error while inserting account ( #22745 )
2020-07-22 16:42:31 +05:30
Marica
514366654e
fix: Serial No Rename does not affect Stock Ledger Entry ( #22746 )
...
* Revert "fix: Remove rename related code from Serial No (#22627 )"
This reverts commit 1ec2d962db
2020-07-22 16:40:24 +05:30
Marica
53646cb360
chore: Export Stock Dashboard ( #22768 )
2020-07-22 16:17:40 +05:30
Shivam Mishra
f50312b6d2
fix: button sizing ( #22777 )
2020-07-22 16:17:11 +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
Afshan
6b9acf4476
updated patch to delete auto email reports and moved patch to v13 from v12
2020-07-22 16:00:18 +05:30
Rucha Mahabal
8d28eacb09
chore: Exported Healthcare Module Dashboard ( #22775 )
2020-07-22 15:57:33 +05:30
Deepesh Garg
d6615248a8
Merge pull request #22762 from DeeMysterio/financial-stat
...
fix(report): fix alignment in script report that extends financial_statements.js
2020-07-22 14:45:22 +05:30
Anupam K
de417d2774
feat: Provision to make RFQ against Opportunity
2020-07-22 01:05:32 +05:30
Afshan
871889220b
style: moved parent warehouse to top section also added a section bre… ( #22708 )
...
* style: moved parent warehouse to top section also added a section break for better look
* style: changes display depends on for HTML field
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 20:39:00 +05:30
Afshan
66d4b42df0
fix: update set query for warehouse after changing the company ( #22632 )
...
* fix: update set query for warehouse after changing the company
* fix: changed set_query to get_query
* fix: variable filter doesn't get updated once set on load hence removed
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 19:59:30 +05:30
Rucha Mahabal
ffbd7b4087
fix: move Video DocType from Core to Utilities module
2020-07-21 19:40:18 +05:30
Diksha Jadhav
09b8caf866
fix(report): fix alignment in script report that extends financial_statements.js
2020-07-21 17:35:10 +05:30
Deepesh Garg
9e5aa282ec
Merge pull request #22753 from nabinhait/trial-balance-opening-cancelled-entry-fix
...
fix: Ignore cancelled entries in trial balance opening
2020-07-21 16:42:02 +05:30
Abhishek Balam
a5b83e85c3
feat: dashboard for timesheet ( #22750 )
2020-07-21 12:54:59 +05:30
Nabin Hait
493b581862
fix: Ignore cancelled entries in trial balance opening
2020-07-21 12:47:16 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column
2020-07-20 16:07:10 +05:30
Afshan
2b21b7bafa
fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options
2020-07-20 16:05:52 +05:30
michellealva
8c7d8ba917
fix: remove tab in code
2020-07-20 13:12:17 +05:30
michellealva
37cd1b8021
fix: Heatmap in Vehicle
2020-07-20 13:04:46 +05:30
Deepesh Garg
04e8af7dca
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes
2020-07-20 09:53:26 +05:30
Chinmay D. Pai
33bf0574a3
chore: fix get single value call
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-19 15:54:11 +05:30
Chinmay D. Pai
5bda28eae6
fix: reset homepage to home after unchecking products page
...
resets homepage back to home when "home page is products" is unchecked
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-19 00:15:40 +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
Deepesh Garg
f6c70bca0a
Merge pull request #22615 from aerele/fix_mandatory_error
...
fix: log type mandatory error while exposing api call to employee checkin.
2020-07-17 17:38:21 +05:30
Deepesh Garg
2fd4aa3051
Merge pull request #22661 from frappe/lead-owner-efficiency
...
fix: making owner fieldtype to link
2020-07-17 17:36:59 +05:30
rohitwaghchaure
f4db8c1c11
Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop
...
fix: currency symbol not showing as per company currency in stock balance report
2020-07-17 16:56:22 +05:30
rohitwaghchaure
b4ef13c686
Merge pull request #22726 from rohitwaghchaure/fixed-actual-qty-showing-as-zero-develop
...
fix: Stock Reconciliation Invalid Quantity for Batched Item
2020-07-17 16:55:59 +05:30
Rucha Mahabal
3e6fe38d02
Merge branch 'develop' into fix-maintenance-visit
2020-07-17 16:34:59 +05:30
Rohit Waghchaure
2347e69cb9
fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date
2020-07-17 14:50:49 +05:30
Rohit Waghchaure
848568d023
fix: currency symbol not showing as per company currency in stock balance
2020-07-17 14:49:12 +05:30
rohitwaghchaure
7e56e80057
Merge pull request #22721 from deepeshgarg007/gstr_test
...
fix: Multiple fixes in GST
2020-07-17 14:34:43 +05:30
Mangesh-Khairnar
9be6787b80
fix(maintenance-visit): change fieldtype of status to select
2020-07-17 12:51:49 +05:30
Rucha Mahabal
7e64a1f170
Merge branch 'develop' into issue-list-action
2020-07-17 11:48:23 +05:30
Deepesh Garg
188273564c
fix: Multiple fixes in GST
2020-07-17 11:31:15 +05:30
michellealva
d02465a68f
fix: Update modified timestamp for Delivery Note Item
2020-07-17 10:35:16 +05:30
marination
6319073d81
fix: Move Issue List actions under 'Actions' dropdown
2020-07-16 15:38:51 +05:30
Karthikeyan S
ff6ba25386
fix: remove FE validation for log_type field
2020-07-16 13:33:38 +05:30
Anurag Mishra
ac23ac6a02
fix: validation for additional salary ( #22645 )
...
* fix: validation for additional salary
* fix:changes requested
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-16 13:10:43 +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
Deepesh Garg
52c319cfa7
fix: Update RCM only for indian countries
2020-07-16 00:23:58 +05:30
Deepesh Garg
2af43b3df6
fix: linting
2020-07-15 21:54:28 +05:30
Deepesh Garg
49821df0ae
Merge pull request #22697 from rohitwaghchaure/fixed-not-able-to-submit-si
...
fix: not able to submit sales invoice
2020-07-15 21:51:16 +05:30
Deepesh Garg
177bbd8e20
Merge pull request #22701 from deepeshgarg007/gstr3b_cess
...
fix: Cess amount in GSTR 3B report
2020-07-15 18:20:42 +05:30
Deepesh Garg
0fa4143bac
fix: Cess amount in GSTR 3B report
2020-07-15 18:17:38 +05:30
rohitwaghchaure
8ff821970a
Merge pull request #22700 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-develop
...
fix: incorrect balance qty in stock ledger report
2020-07-15 17:25:11 +05:30
Rohit Waghchaure
132376750c
fix: incorrect balance qty in stock ledger report
2020-07-15 17:23:17 +05:30
Rohit Waghchaure
e0de0ac617
fix: not able to submit sales invoice
2020-07-15 17:13:43 +05:30
Rohit Waghchaure
07cc918d70
fix: patch update_actual_start_and_end_date_in_wo
2020-07-15 16:41:32 +05:30
Suraj Shetty
34617744e1
fix: Show total row in print format of financial statement
2020-07-15 16:37:21 +05:30
rohitwaghchaure
f16bd00463
Merge pull request #22608 from ruchamahabal/fix-sla-ui
...
fix: allow creating SLA documents even if SLA tracking is not enabled
2020-07-15 15:47:37 +05:30
rohitwaghchaure
30030230bf
Merge pull request #22675 from marination/material-request-warehouse
...
fix: Dont overwrite default warehouse in Material Request
2020-07-15 15:35:38 +05:30
rohitwaghchaure
7c08ff7572
Merge pull request #22596 from marination/exploded-item-rate
...
fix: Exploded Item Rate in BOM
2020-07-15 14:30:27 +05:30
Rohit Waghchaure
e1b3f16abd
fix: project field added two time in purchase receipt
2020-07-15 12:28:19 +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
marination
392f323d2d
fix: Dont overwrite default warehouse in Material Request
2020-07-14 17:03:17 +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
Rucha Mahabal
c4a1b34811
Merge branch 'develop' into fix-sla-error
2020-07-14 13:24:57 +05:30
Marica
82a606d04b
fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging ( #22666 )
2020-07-14 13:16:28 +05:30
Anupam Kumar
c5f14da99c
Merge branch 'develop' into lead-owner-efficiency
2020-07-14 12:59:42 +05:30
Rucha Mahabal
88931f0677
fix(Support): TypeError while saving Service Level Agreement
2020-07-14 11:46:11 +05:30
John Veness
72320afb07
Correct help link for Address ( #22673 )
2020-07-14 10:44:15 +05:30
bhavesh95863
eb69859d3e
fix: Quotation list view blank if quotation_to field not set as a standard filter
2020-07-13 23:15:31 +05:30
rohitwaghchaure
165d57aa0b
Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop
...
fix: '>' not supported between instances of 'str' and 'int'
2020-07-13 18:11:50 +05:30
rohitwaghchaure
165eb5a1c3
Merge pull request #22665 from marination/maintenance-schedule
...
fix: Block Invalid Serial No updates in Maintenance Schedule
2020-07-13 18:11:06 +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
Marica
3f8840cd7a
Merge branch 'develop' into maintenance-schedule
2020-07-13 15:24:37 +05:30
Rucha Mahabal
68cc3e4220
Merge branch 'develop' into fix-sla-ui
2020-07-13 14:40:01 +05:30
Anurag Mishra
b9d8ff91a5
Merge branch 'develop' into lead-owner-efficiency
2020-07-13 14:22:34 +05:30
Anurag Mishra
d38c22d85d
Merge branch 'develop' into fixed-error-report-related-to-task-develop
2020-07-13 14:21:58 +05:30
rohitwaghchaure
a8fea8df98
Merge pull request #22614 from deepeshgarg007/payment_reco_cost_center_fix
...
fix: Add default cost center in payment reconciliation JV
2020-07-13 13:44:49 +05:30
marination
1791bc187b
fix: Block Invalid Serial No updates in Maintenance Schedule
2020-07-13 12:32:09 +05:30
Rohit Waghchaure
2e8d8b9aeb
fix: '>' not supported between instances of 'str' and 'int'
2020-07-13 12:09:10 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts
2020-07-13 11:50:11 +05:30
Afshan
ccf6b5f640
Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing
...
Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing
2020-07-13 11:45:33 +05:30
Afshan
e40605d711
Merge remote-tracking branch 'upstream/develop' into club-mr-column
...
Merge remote-tracking branch 'upstream/develop' into club-mr-column
2020-07-13 11:43:19 +05:30
Deepesh Garg
f5a457c397
Merge branch 'develop' into lead-owner-efficiency
2020-07-13 11:32:09 +05:30
Anupam K
cd445786fe
making owner fieldtype to link
2020-07-12 20:03:15 +05:30
Afshan
d058840094
fix: removed fiscal year field from "Request for Quotation" doctype ( #22446 )
...
* fix: removed fiscal year field from "Request for Quotation" doctype
2020-07-12 19:19:59 +05:30
Raffael Meyer
193e12f02a
fix: download button ( #22652 )
2020-07-12 17:26:27 +05:30
Afshan
83cd1dcc44
fix: Add project filter in parent task field ( #22655 )
...
* fix: Add project filter in parent task field
2020-07-11 21:54:54 +05:30
Deepesh Garg
1ab228b52e
Merge pull request #22657 from deepeshgarg007/eway_bill_json_gen
...
fix: ewaybill json had json dump of json dump, and other related fixes
2020-07-11 21:42:01 +05:30
Sagar Vora
c9b4ba6de8
fix: ewaybill json had json dump of json dump, and other related fixes
2020-07-11 21:29:17 +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
Deepesh Garg
a9820cdcf6
fix: Remove every bit of randomness from this test
2020-07-11 19:38:51 +05:30
Deepesh Garg
46bcb46422
fix: Do not use random customers
2020-07-11 18:36:32 +05:30
Deepesh Garg
f15ff5fbfa
fix: Test
2020-07-11 13:58:53 +05:30
Deepesh Garg
87eb2827ef
fix: Update tests
2020-07-10 22:45:45 +05:30
marination
a6c10b1bc0
fix: Pricing Rule breaks if no item_code
2020-07-10 20:09:58 +05:30
Karthikeyan S
183ebb237e
Merge branch 'develop' into fix_mandatory_error
2020-07-10 18:05:18 +05:30
gavin
ecf2bae041
Merge branch 'develop' into erpnext-install-check
2020-07-10 17:42:39 +05:30
Afshan
e9affe3705
merge branch develop
2020-07-10 16:31:40 +05:30
Faris Ansari
70aa3c0b1f
fix: Remove explicit exception
...
Co-authored-by: gavin <gavin18d@gmail.com>
2020-07-10 16:13:21 +05:30
Afshan
0863beec92
created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport"
2020-07-10 15:14:01 +05:30
Afshan
dca8a1d69d
renamed "pending qty" to "qty to recieved"
2020-07-10 14:26:21 +05:30
rohitwaghchaure
bca8483dc8
Merge pull request #22634 from Anurag810/retention-bonus-fixes
...
fix: default overwrite property and 'company' is not defined
2020-07-10 13:41:40 +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
Marica
eee12fbcb4
fix: Remove redundant variable declaration ( #22641 )
2020-07-10 12:34:59 +05:30
Afshan
fd28f1071e
style: arrangements of filters for reports ( #22636 )
2020-07-10 11:25:39 +05:30
rohitwaghchaure
3a3787f9e7
fix: Due to decimal issue make purchase receipt button not showing from PO ( #22629 )
2020-07-09 20:07:40 +05:30
rohitwaghchaure
d14666e419
fix: incorrect delivered qty in Supplier-Wise Sales Analytics ( #22631 )
2020-07-09 20:07:10 +05:30
Marica
1ec2d962db
fix: Remove rename related code from Serial No ( #22627 )
2020-07-09 20:02:18 +05:30
Deepesh Garg
b74077faf5
fix(travis): Item Tax tempate template test
2020-07-09 19:50:41 +05:30
Anurag Mishra
d7563f0327
fix: default overwroite property n 'company' is not defined
2020-07-09 19:40:18 +05:30
Rohan
cdf55cef80
fix: fetch project-related info in Timesheet ( #22423 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-09 11:36:01 +05:30
Rucha Mahabal
6c6c36e780
fix: attribute error while cancelling patient encounter
2020-07-09 11:23:41 +05:30
Afshan
a629c9e1bc
style: remove import comment
2020-07-08 19:28:28 +05:30
Afshan
d16d0efde5
feat: added range for age in stock ageing
2020-07-08 19:23:13 +05:30
Rucha Mahabal
45b01d2c02
feat: add medical coding fields to Healthcare DocTypes ( #22501 )
...
* feat: add medical coding fields to templates
* feat: fetch medical codes from templates in forms
* fix: codacy issues
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 15:39:45 +05:30
Afshan
e0ff0cfcb9
fix: fetch "Employee Leave Policy" from "Employee Grade" if available ( #22570 )
...
* fix:fetch "Employee Leave Policy" from "Employee Grade" if available
* fix: checked "Fetch IF Empty" checkbox
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:40:22 +05:30
Marica
b78dc75456
Merge pull request #22573 from deepeshgarg007/employee_tree
...
feat: Added all companies option in employee tree to view employee ac…
2020-07-08 14:34:33 +05:30
rohitwaghchaure
0cd39e3a38
Merge pull request #22611 from frappe/hrms-dashboard-fix
...
fix: HR dashboard number card filter
2020-07-08 14:33:45 +05:30
Marica
9e73fdd866
Merge branch 'develop' into employee_tree
2020-07-08 14:33:10 +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
Marica
3f05a2692e
Merge branch 'develop' into employee_tree
2020-07-08 14:04:49 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts
2020-07-08 13:11:37 +05:30
Marica
0afdafdbce
Merge branch 'develop' into error-message
2020-07-08 13:07:01 +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
rohitwaghchaure
be9f8dc5db
Merge pull request #22522 from Anurag810/leave_application_fixes
...
fix: set half day date None if half day is unchecked
2020-07-08 12:40:30 +05:30
rohitwaghchaure
1fce8b7475
Update leave_application.js
2020-07-08 12:40:01 +05:30
rohitwaghchaure
c7b63bfcaf
Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0
...
fix: Create salary slip button disappears
2020-07-08 12:35:24 +05:30
rohitwaghchaure
e862b3f9ce
Update payroll_entry.js
2020-07-08 12:34:15 +05:30
rohitwaghchaure
3431d42d12
Merge pull request #22610 from frappe/lead-creation-from-email
...
fix: Creating Lead from email
2020-07-08 12:27:18 +05:30
rohitwaghchaure
50f48f5176
Merge pull request #22592 from frappe/number-card-filter-fix
...
fix: crm dashboard Number card filter fix
2020-07-08 12:25:12 +05:30
rohitwaghchaure
fae570e0a2
Merge pull request #22612 from netchampfaris/fix-item-price-labels
...
fix: Remove trailing spaces from labels
2020-07-08 12:14:21 +05:30
Faris Ansari
0a06580e2c
fix: Update message
...
Co-authored-by: gavin <gavin18d@gmail.com>
2020-07-08 12:06:28 +05:30
Deepesh Garg
9071a7de82
fix: Add default cost center in payment reconciliation JV
2020-07-08 11:27:25 +05:30
Kaviya Periyasamy
923ed8a741
fix: log type mandatory error while exposing api call to employee checkin
2020-07-08 11:15:04 +05:30
Faris Ansari
f3a6e30e6a
fix: Check if homepage is not setup-wizard
...
The new desk changes sets the default homepage to 'workspace'. To avoid
problem in the future, check if the value is not setup-wizard.
Also throw an exception if the check passes, so it exits with error.
2020-07-08 10:45:55 +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
Faris Ansari
8c5c74ca06
fix: Remove trailing spaces from labels
2020-07-08 09:20:13 +05:30
Anupam K
6669f7457a
hr dashboard number card filter fix
2020-07-08 01:24:53 +05:30
Anupam K
8bc92b90f5
updating lead.py
2020-07-08 00:56:21 +05:30
Rucha Mahabal
3d14011d23
fix: allow creating SLA documents even if SLA tracking is not enabled
2020-07-07 18:30:54 +05:30
Afshan
e3269039d3
feat: added columns to get complete analysis for material request
2020-07-07 18:01:37 +05:30
Marica
4d5d706a4b
Merge branch 'develop' into error-message
2020-07-07 16:41:39 +05:30
Mitali Deshpande
f642be9727
fix: Changed error message in the Product Bundle
2020-07-07 16:14:01 +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
