Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,687 Commits 3 Branches 0 Tags 1 GiB
c5c7777bd5
Commit Graph

7263 Commits

Author SHA1 Message Date
Anuja Pawar
e1967870a9
Merge pull request #27906 from Anuja-pawar/accounts-settings 
fix(Accounts Settings): Update label
 2021-10-12 10:27:23 +05:30
Dany Robert
7acdcc70ad
fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897) 
* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue
 2021-10-11 15:05:55 +05:30
rohitwaghchaure
3f99a87e3d
Merge pull request #27863 from rohitwaghchaure/multi-currency-issue-for-consolidated-report 
fix: consolidated report not consider company currency
 2021-10-11 14:06:08 +05:30
Deepesh Garg
1aba3592fa
Merge pull request #27369 from Havenir/ksa-vat 
feat(regional): KSA E-Invoicing and VAT Report
 2021-10-11 12:16:51 +05:30
Rohit Waghchaure
19d14da0d4 fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)' 2021-10-10 14:00:25 +05:30
Himanshu
4f5d82c817
Merge branch 'develop' into subscription_generation_fix_develop 2021-10-09 09:39:27 +01:00
Himanshu
44306bd0e5
Update subscription.py 2021-10-09 09:37:54 +01:00
Rohit Waghchaure
dc4206428d fix: consolidated report not consider company currency 2021-10-08 12:10:35 +05:30
Anuja Pawar
5cc3ea0aa7
fix(Payment Reconciliation): minor ux fixes (#27779) 
* fix: minor fixes

* fix: Linters check

* fix: sider check

* fix: kept unallocated payment amount hidden in allocation

* fix: removed Add row button from the tables (redundant)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-10-07 21:09:15 +05:30
Himanshu
951ab9f78f
Merge branch 'develop' into subscription_generation_fix_develop 2021-10-06 19:22:40 +01:00
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check (#27828) 
* refactor: Clean up mutable defaults and add CI check
 2021-10-06 16:58:48 +00:00
hrwx
ae657c7e4e fix: create past invoices 2021-10-06 17:32:39 +01:00
Sagar Vora
656015d99d test: use test_dependencies instead of duplication 2021-10-06 16:46:01 +01:00
Sagar Vora
fc375c5bde fix: remove newline 2021-10-06 16:46:01 +01:00
hrwx
0f03b19109 fix: reorder updation of end date 2021-10-06 16:46:01 +01:00
Marica
ff7506d4a6
fix: revert "fix: missing link in dashboard missing on SI from DN" (#27832) 2021-10-06 13:35:22 +05:30
Marica
2691a15c91
Merge pull request #27360 from FHenry/dev_fix_27359 
fix: missing link in dashboard missing on SI from DN
 2021-10-06 13:04:50 +05:30
GangaManoj
273fccf0dd fix: Add test for depreciation on return of sold Asset 2021-10-06 02:08:28 +05:30
GangaManoj
f51bd44929 fix: Unlink Depreciation Entry made on sale if the Asset is returned 2021-10-06 01:18:05 +05:30
GangaManoj
62fea8a5aa fix: Rename tests 2021-10-05 21:38:39 +05:30
Deepesh Garg
91bf40d692
Merge pull request #27811 from frappe/mergify/bp/develop/pr-27792 
fix: COA Importer showing blank validations (backport #27792)
 2021-10-05 21:23:21 +05:30
Afshan
cec66d2d10
fix: removed redundant piece of code (#27817) 2021-10-05 19:14:39 +05:30
Deepesh Garg
fee54023a6
Merge branch 'develop' into mergify/bp/develop/pr-27792 2021-10-05 17:22:24 +05:30
mergify[bot]
233bf5dd29
fix: using DN for transfer w/o internal customer (backport #27798) (backport #27805) (#27807) 
* fix: using DN for transfer w/o internal customer (backport #27798) (#27805)

* fix: using DN for transfer w/o internal customer (#27798)

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* fix: resolve conflict

* fix: resolve conflicts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-05 16:16:21 +05:30
Deepesh Garg
020f94532b fix: COA Importer showing blank validations 
(cherry picked from commit 0660d6ed01e0668ce828cf9bae9790aead874233)
 2021-10-05 09:49:05 +00:00
Saqib
74c8e7bb97
Merge branch 'develop' into pay-received-amt-fix 2021-10-05 11:14:41 +05:30
Sagar Vora
09ccdee2db
feat: add total_billing_hours to Sales Invoice (fp #26783) (#27742) 
* feat: add `total_billing_hours` to Sales Invoice

* fix: re-save doctypes

* fix: indentation

* fix: replace reference to old function
 2021-10-04 16:41:24 +05:30
Rucha Mahabal
5905cf9002
refactor!: Removed healthcare module from ERPNext (#27362) 
* chore: Removed healthcare module

* chore: Removed healthcare demo, patch files

* chore: Rename imports from erpnext to healthcare

* chore: Added healthcare deprecation warning patch

* chore: Removed healthcare module code in other modules

* chore: Code clean up

* refactor: Remove sales invoice custom js related to healthcare

* fix: sider

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-04 15:46:40 +05:30
Saqib
9051735529
perf: fetching of account balance in chart of accounts (#27661) 2021-10-04 11:44:46 +05:30
Saqib Ansari
1b7414e948 fix: cannot add deductions in internal transfer payment entry 2021-10-04 11:24:02 +05:30
Deepesh Garg
4abb43a425
Merge pull request #27749 from GangaManoj/fix-pe-payment-term 
fix: Display appropriate message for Payment Term discrepancies in Payment Entry
 2021-10-04 11:06:20 +05:30
ChillarAnand
a1d3a09d3c Merge branch 'develop' into care 2021-10-04 09:46:34 +05:30
Deepesh Garg
f109f6fd16 fix: Linting issues 
(cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)
 2021-10-02 16:10:09 +00:00
Deepesh Garg
237b1a91de fix: Remove unwanted comments 
(cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)
 2021-10-02 16:10:09 +00:00
Deepesh Garg
9244fe563a fix: Chart Of Accounts import button not visible 
(cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)
 2021-10-02 16:10:08 +00:00
GangaManoj
9f14695743 fix: Display appropriate message if different Payment Terms are used in PE and its Payment References 2021-10-02 21:02:07 +05:30
HENRY Florian
0bc213ed17
Merge branch 'develop' into dev_fix_27359 2021-09-30 11:08:44 +02:00
Deepesh Garg
f1a669c2f7 fix: Test case 
(cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)
 2021-09-30 03:06:02 +00:00
Deepesh Garg
774cd68f4c fix: Test Case 
(cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)
 2021-09-30 03:06:01 +00:00
Deepesh Garg
13d2e7b198 fix: Deferred revenue entries post account freezing 
(cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)
 2021-09-30 03:06:00 +00:00
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) 
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs

* fix: Ignore user permission for fiscal year company
 2021-09-29 15:54:35 +05:30
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale 2021-09-27 22:18:04 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes (#27451) 
* fix: TDS deduction using journal entry

* fix: Multi category application against single supplier

* refactor: TDS payable monthly report

* fix: Server side handling for default tax withholding category

* fix: Supplier filter for Journal Entry

* refactor: TDS computation summary report
 2021-09-27 21:43:20 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test (#27662) 2021-09-27 15:03:58 +05:30
ChillarAnand
765a9bb731 refactor: Remove sales invoice custom js related to healthcare 2021-09-27 07:34:54 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644 2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b chore: hide exchange gain loss if empty 2021-09-26 17:07:13 +05:30
Saqib Ansari
dd2d039ca8 chore: hide exchange gain loss if empty 2021-09-26 15:51:03 +05:30
GangaManoj
796ed947ce fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned 2021-09-25 19:11:29 +05:30
GangaManoj
b9fb59da58 fix: Reset depreciation schedule on returning asset 2021-09-25 19:04:16 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
GangaManoj
7ab3b9dd5a fix: Add test for depreciation on sale of a depreciated Asset 2021-09-21 07:11:40 +05:30
Ganga Manoj
eb8122baba
Merge branch 'develop' into fix-depr-after-sale 2021-09-21 06:29:41 +05:30
GangaManoj
244d9dee04 fix: Correct expected_values 2021-09-21 06:06:21 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table (#27602) 2021-09-20 21:32:38 +05:30
ChillarAnand
aa580769a6 chore: Code clean up 2021-09-20 15:27:43 +05:30
Deepesh Garg
f07ff92a35
fix: Improvements in COA Importer (#27584) 2021-09-20 11:12:39 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields (#27524) 
* fix: Tax breakup based on items

* fix: added gst fields,warehouse validation to pos inv,patch

* fix: tax breakup test fix, eway bill hsn fix

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-17 10:39:03 +05:30
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group (#27471) 
* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-16 19:33:57 +05:30
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report (#27493) 2021-09-15 10:10:54 +05:30
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA (#27363) 2021-09-09 19:37:52 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js (#27410) 2021-09-09 19:17:01 +05:30
Deepesh Garg
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity 
feat: Validity dates in Tax Withholding Rates
 2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports (#27374) 2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271 fix: Linting Issues 2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39 fix: Test Case 2021-09-09 11:13:29 +05:30
Saqib
9c27f9be1e
fix: document naming rule not working for subscription invoices (#27386) 2021-09-08 16:47:04 +05:30
Dany Robert
fa819f2fb0
fix: General Ledger translation issues (#27298) 
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-08 16:28:05 +05:30
Saqib
df3e4ce1c0
fix: scan barcode fields input length (#27389) 
* fix: undo unintentional changes

* fix: scan barcode fields input length
 2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-08 11:33:42 +05:30
rohitwaghchaure
058d98342a
fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) 
* fix: missed to add voucher_type, voucher_no to get gl entries

* test: get voucherwise details utilities

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-07 12:14:40 +05:30
Ahmad
b42d63e526 Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat 2021-09-06 23:26:52 +05:00
Ahmad
cb0c2d1477 feat(Regional): KSA VAT Report 2021-09-06 23:25:20 +05:00
ChillarAnand
c8565c7090 chore: Removed healthcare module code in other modules 2021-09-06 20:47:27 +05:30
Florian HENRY
aa7ee3ca03 fix: link in dashboard missing on SI from DN 2021-09-06 11:40:44 +02:00
Deepesh Garg
51d9572fe7 fix: Hardcode fiscal year and posting date 2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports (#27316) 2021-09-05 17:21:29 +05:30
Deepesh Garg
092d41ecda fix: Debug CI 2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18 Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop 
feat: CDNR Unreg json generation
 2021-09-03 13:55:00 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
ChillarAnand
e913e277d9 chore: Rename imports from erpnext to healthcare 2021-09-02 19:47:39 +05:30
Deepesh Garg
e1fffdb262 fix: Linting issues 2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Ankush Menat
eec40513be
fix: minor linting issues (#27314) 
* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions
 2021-09-02 17:42:45 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
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
Deepesh Garg
d5a736d11e test: Update test case 2021-09-01 21:15:24 +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
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Deepesh Garg
b6d0b17ed6 fix: Linting and patch fixes 2021-09-01 10:11:18 +05:30
Deepesh Garg
d06221ad7a fix: Advance TDS test case 2021-09-01 10:05:10 +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
Deepesh Garg
5e10e10329 feat: Validity dates in Tax Withholding Rates 2021-08-31 18:23:28 +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
Ahmad
9cc451fc7d feat(Regional): KSA VAT Report 2021-08-26 07:35:59 +05:00
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
GangaManoj
3edb1938a9 fix: Fetch bundle item details 2021-08-24 23:38:24 +05:30
GangaManoj
257215f479 fix: Fetch base_net_total for each Invoice 2021-08-24 23:32:19 +05:30
GangaManoj
1956f62ad8 fix: Remove qty from Sales Invoice rows 2021-08-24 23:30:50 +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
GangaManoj
46650cce0d fix: Calculate total buying_amount and gross profit for each invoice 2021-08-23 21:17:32 +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
GangaManoj
d1453c0cd0 fix: Remove Item Code and Item Name columns 2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc fix: Display Items in the format Item Code: Item Name 2021-08-20 18:25:36 +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
GangaManoj
b5fac83987 fix: Add items belonging to Product Bundles as children 2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d fix: Set initial_depth to 3 2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3 fix: Assign indent and parent_invoice 2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5 fix: Make Invoice row bold 2021-08-20 02:38:34 +05:30
GangaManoj
5ffaff8e48 fix: Display items as descendants of invoices 2021-08-20 02:20:18 +05:30
GangaManoj
17a154017b fix: Display data in tree form 2021-08-20 02:19:18 +05:30
GangaManoj
76921137ed fix: Return data as dict if the report is grouped by Invoice 2021-08-20 02:16:49 +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
Afshan
2416b3a1ee
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:03:47 +05:30
rohitwaghchaure
c068e8128c
Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading 
fix: sales invoice not loading issue
 2021-08-18 10:32:54 +05:30
Rohit Waghchaure
e0862de863 fix: sales invoice not loading issue 2021-08-18 10:27:58 +05:30
GangaManoj
4a77bd2304 fix: Syntax error 2021-08-18 00:33:43 +05:30
Afshan
5fec44446e
fix: set account for change amount even if pos profile not found (#26986) 2021-08-17 20:06:19 +05:30
Deepesh Garg
93fc469ace
Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix 
fix: Incorrect unallocated amount calculation in payment entry
 2021-08-17 19:13:58 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
Deepesh Garg
fd739749ba test: Add test case for payment entry 2021-08-17 16:38:25 +05:30
Frappe PR Bot
a14d218834
fix: typo (#26967) (#26984) 
(cherry picked from commit ace8cf965d2aab3faa18aa704e0e796f707cc666)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-08-17 16:14:37 +05:30
Deepesh Garg
b1bcb3bf13 fix: Incorrect unallocated amount calculation in payment entry 2021-08-17 11:28:46 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Deepesh Garg
58c1739eac fix: Budget variance missing values 2021-08-16 18:04:57 +05:30
Deepesh Garg
8410e4854f fix: Budget variance missing values 2021-08-16 17:14:40 +05:30
GangaManoj
f9356ee642 fix: Sider issues 2021-08-13 17:40:51 +05:30
GangaManoj
f977c65e80 fix: Make enable_discount_accounting a class property 2021-08-13 17:17:58 +05:30