Commit Graph

7020 Commits

Author SHA1 Message Date
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
feat: Improve Product Bundle handling
2021-09-02 11:12:56 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
GangaManoj
bc79084dac fix: Add Product Bundle field in Items table 2021-09-01 16:06:47 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9 fix: Remove Add Row and Delete Row options for Packed Items table 2021-09-01 15:20:40 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-31 22:08:10 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool (#27128) 2021-08-31 18:59:29 +05:30
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive (#27262) 2021-08-31 18:50:23 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix (#26364)
* feat: Full and Final Settlement

* removed option to pay via salary slip

* feat: Create JV

* test:fnf

* fix: tracking asset movement

* fix: sider and test

* fix: changes Requested

* fix: changes requested

* fix: valication for Asset

* fix: add filter for reference document only if relevant field is present

* fix: doctype cleanup

- add more fields to the list view and standard filter

- set title field

- incorrect field labels

* feat: add list view settings for FNF

* fix: incorrect reference type set in Journal Entry

* fix: validation message

* chore: add Full and Final Statement link to Workspace

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-31 17:59:26 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update (#27204) 2021-08-30 13:17:22 +05:30
François de Ryckel
327071cb90
replace cur_frm with frm (#27210) 2021-08-28 14:55:11 +05:30
GangaManoj
e44567754d fix: Display Packed/Bundle Items table only if it exists 2021-08-27 20:16:13 +05:30
Devin Slauenwhite
072151e16d
feat: Payment reconciliation on accounts module workspace (#25925)
* feat: add payment reconciliation to accounting workspace

* fix: update modified and duplicate the link

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-27 19:44:57 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration (#27200)
* fix: patches were breaking during migrating

* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup (#27112)
* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 15:47:11 +05:30
Saqib
08188f2ac7
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 15:41:41 +05:30
Saqib
987746592c
fix: period closing voucher tests (#27198) 2021-08-27 15:41:26 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 14:48:54 +05:30
Deepesh Garg
ae7ec8e44d
fix: Base amount in tax gl entry 2021-08-26 23:51:09 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information (#26107)
* fix: use Stripe's new Plan API for price information

* patch: use inbuilt function to rename field

* fix: patch call

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Lovin Maxwell
f91faac7cd
fix: Pricing Rule on Transaction Based on Coupon (#26949) 2021-08-26 20:54:02 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179)
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Deepesh Garg
4b1f165429
fix: Use reverse debit and credit to get net amount in GL Entries (#27174)
* fix: Use reverse debit and credit to get net amount in GL Entries

* fix: Remove unused import
2021-08-26 18:34:15 +05:30
marination
45edfd9d50 fix: Remove duplicate create_internal_customer util
- Introduced via https://github.com/frappe/erpnext/pull/27086
2021-08-26 15:53:52 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled (#27086)
* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
2021-08-26 13:12:51 +05:30
Deepesh Garg
e2af9d5761
Merge pull request #27039 from nextchamp-saqib/common-party-acc
feat: common party accounting
2021-08-26 12:58:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note (#27036)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-26 12:52:36 +05:30
Brian Pond
1a919773d7
fix: Customers 'primary_address' not updated automatically (#26798) (#26799)
* Fix for Issue #26798

This PR is a fix for GitHub Issue 26798:
https://github.com/frappe/erpnext/issues/26798

TLDR:  When an Address is updated, and that Address is a Customer's Primary Address, update the Read Only field `customer.primary_address`

* Update address.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-26 11:57:28 +05:30
Saqib Ansari
be7a38b662 fix: cost center in test_sales_invoice_against_supplier 2021-08-25 21:35:32 +05:30
Ganga Manoj
842ceb1301
fix: cannot reconcile bank transactions against internal transfer payment entries (#26932)
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled

* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction

* fix: indentation and args

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-25 20:32:26 +05:30
Rohan
87308465d8
fix: create zero-dollar invoices fro trial subscriptions (#26441) 2021-08-25 20:11:05 +05:30
Saqib Ansari
a2f8d6c31a fix: party link permissions 2021-08-25 20:10:19 +05:30
Saqib Ansari
c101b42d4a feat: validate multiple links 2021-08-25 20:08:28 +05:30
Saqib Ansari
881301ca9b Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc 2021-08-25 20:02:27 +05:30
Frappe PR Bot
81b4590479
fix: TDS calculation on net total (#27058) (#27140)
(cherry picked from commit 4eb7c2a011f3abbe547c2a32978e7af6e1fd6d33)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-25 18:18:16 +05:30
Ankush Menat
8d116fb9ff
fix: remove VARCHARs from Sales Invoice (#27136)
Sales Invoice doctype is starting to hit row length limit as many
integrations add custom fields on this doctype. This is just a small
change to remove VARCHAR(140) fields and reduce row size wherever
possible.
2021-08-25 16:45:41 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction (#27109) 2021-08-25 16:25:51 +05:30
GangaManoj
3135d6dc6a fix: Get Bundle Items 2021-08-25 15:35:40 +05:30
GangaManoj
13ae10b3a2 fix: Remove comments 2021-08-25 15:20:27 +05:30
Afshan
8366b6322e
fix: validate party and party type only if both available (#27002)
* fix: validate party and party type only if both available

* fix: indentation
2021-08-25 11:57:24 +05:30
Saqib
1dadea38a5
fix: remove unexpected comma (#27132) 2021-08-25 11:05:51 +05:30
GangaManoj
bea0f7a202 fix: Get data when grouped by invoice and otherwise 2021-08-25 02:52:18 +05:30
GangaManoj
96909b6c3b fix: Display only the Invoice rows in bold 2021-08-25 02:49:14 +05:30
GangaManoj
b02effbc47 fix: Indentation 2021-08-25 01:00:40 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle 2021-08-25 00:55:47 +05:30
GangaManoj
5f8c2b0946 fix: Remove base_rate and buying_rate for Invoice rows 2021-08-25 00:33:55 +05:30
GangaManoj
2dbf8075eb fix: Calculate total buying_amount for each invoice 2021-08-25 00:09:07 +05:30