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
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
Subin Tom
fbc5977248
fix: Updated timestamp for pos invoice json ( #27110 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-24 22:34:02 +05:30
Anupam Kumar
1d6ef4b0d3
fix: replacing $.each -> forEach in SI ( #26995 )
...
* fix: replacing $.each -> forEach in SI
* fix: removed console log
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:06:19 +05:30
Frappe PR Bot
512ddc589f
fix: timesheet amount issue ( #25993 ) ( #26889 )
...
* fix: timesheet amount issue
* fix: timesheet detail rate conversion
* fix: condition to check timesheet currency
* fix: removing console statement
(cherry picked from commit a6aa6cd7d6
)
Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:00:32 +05:30
Saqib
f1313302c9
fix: pos invoice test ( #27113 )
2021-08-24 19:45:21 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available ( #27078 )
2021-08-24 17:27:27 +05:30
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books ( #26921 )
2021-08-24 17:26:23 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test ( #27099 )
...
* fix: pos closing entry cancellation test
* fix: invalid imports
* fix: sider issue
2021-08-24 15:37:00 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on
instead of code ( #27008 )
2021-08-24 12:07:38 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop
...
fix: Multiple fixes in payment entry
2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 ( #27083 )
2021-08-23 15:38:26 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary ( #27069 )
2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc
2021-08-20 20:42:50 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Saqib Ansari
8e79c48db8
fix: remove unwanted filter query
2021-08-19 18:10:02 +05:30
Saqib Ansari
71e7254184
test: creation of advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
977b09b6ba
feat: auto create advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
cad08bc428
feat: toggle to enable common party accounting
2021-08-19 18:09:35 +05:30
Saqib Ansari
dddc29fdc1
feat: initialize party link for customer & suppliers
2021-08-19 18:09:35 +05:30
Noah Jacob
6541453c16
fix(ux): removed rate from grid view
2021-08-19 15:53:55 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Deepesh Garg
869e36c33a
Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix
...
fix: Payment Reconciliation party validation issue
2021-08-19 12:40:54 +05:30
Afshan
ecd6584c50
fix: assigning values to rows in sales register reports ( #26546 )
...
* fix: assigning values to rows in sales register reports
* fix: check for is_internal_customer for unrealized_profit_loss_account
2021-08-19 12:18:27 +05:30
Subin Tom
ef792971f3
fix: Add ignore user perms to set_target_warehouse field in sales invoice ( #26987 )
...
* reverting ot v12.7.1
* fix: Ignore user permissions for set_target_warehouse in SI
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-18 18:20:04 +05:30