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

38715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuja Pawar
baa548a3df
fix(regional): minor fixes and test for South Africa VAT report (#26933) 
* fix: added test and minor fixes

* fix: sider fixes

* fix: sider

* fix: test fixes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-08-26 12:48:43 +05:30
Rucha Mahabal
642b4c805c
fix: Fee Validity fixes (#27156) 
* chore: update Fee Validity form labels

* fix: first appointment should not be considered for Fee Validity

* fix: Fee Validity test cases

* fix: appointment test case
 2021-08-26 12:15:49 +05:30
Anupam
fbac514929 feat: prospect permission 2021-08-26 12:14:29 +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
Anupam Kumar
c8f22e5524
fix: removing toggle_display for address and contact HTML (#27152) 2021-08-26 10:46:55 +05:30
Anupam
efdeee4d1f fix: conflicts 2021-08-26 00:15:35 +05:30
Saqib Ansari
be7a38b662 fix: cost center in test_sales_invoice_against_supplier 2021-08-25 21:35:32 +05:30
Ashish Shah
b99c011947
fix: unable to create manual / auto asset depreciation entry when cost_center is mandatory (#26912) 
Summary : unable to create manual / auto asset depreciation entry when cost_center is mandatory

Reason: Though we are calculating value for depreciation_cost_center, it is not passed in credit_entry(it is passed in debit_entry) and this prevents creation of manual / auto asset depreciation entry when cost_center is mandatory

Solution : pass already calculated depreciation_cost_center value in credit_entry (in line with, already done as in debit_entry)
 2021-08-25 21:33:08 +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
Saqib Ansari
c6c7a8b5cf fix: cost center & naming series 2021-08-25 20:17:04 +05:30
Saqib Ansari
7254368fc5 perf: reduce number of queries to get party link 2021-08-25 20:15:23 +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
Chillar Anand
81b28b8998
fix(healthcare): Removed ignore user permissions flag in appointment (#27129) 2021-08-25 20:08:11 +05:30
rohitwaghchaure
ad45ddcabe
fix: sequence of sub-operations in job card (#27138) 2021-08-25 20:07:18 +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
Anupam Kumar
4d98be2126
feat: provision to create customer from opportunity (#27141) 
* feat: provision to create customer from opportunity

* fead: linking of address and contact

* revert: create_opportunity_address_contact

* enabming print hide and no copy
 2021-08-25 19:18:17 +05:30
18alantom
c7e11c89ff fix: get filters to work 
- reorder and rename columns
- add work order filter
 2021-08-25 18:58:56 +05:30
Saqib
60675379c2
fix: partial rename while replacing abbreviation (#27065) 2021-08-25 18:26:00 +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
Anupam
5ad8afcc8d revert: creation of customer from opportunity 2021-08-25 17:36:53 +05:30
Marica
7cb1eec1f8
Merge pull request #27055 from 18alantom/update-stock-onboarding-fp 
refactor: update stock module onboarding (frontport #25745)
 2021-08-25 16:59:28 +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
Anupam
c644fbb102 fix: sider issues 2021-08-25 16:35:34 +05:30
18alantom
dbea840ecf fix: re-order tour to circumvent glitchy save highlight 2021-08-25 16:34:31 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction (#27109) 2021-08-25 16:25:51 +05:30
Anupam
dfcac64b44 fix: review chnages 2021-08-25 16:24:46 +05:30
GangaManoj
e4c25bf4bb fix: Return if there are no Items 2021-08-25 15:40:42 +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
Chillar Anand
a65498dc61
fix(healthcare): Made payment fields mandatory for new appointments (#26608) 
* fix(healthcare): Made payment fields mandatory for new appointments

* fix: sider issues

* fix: Fix failing test

* fix: Patient appointment invoicing

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-08-25 14:40:22 +05:30
Marica
b7ef4ce7a2
Merge pull request #27052 from 18alantom/fix-scrap-items-updation 
fix: update scrap table item details; typo
 2021-08-25 12:32:49 +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
77352ae47e fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled 2021-08-25 00:12:43 +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
GangaManoj
1d82c3effe fix: Make Rate editable if editable_bundle_item_rates is checked 2021-08-24 22:25:59 +05:30
Dany Robert
c7bad657b1
fix: broken URL in supplier portal (#26823) 
* fix: broken URL

The quotations are supplier quotations, not sales quotation.

* fix: remove erpnext from path
 2021-08-24 22:10:14 +05:30
GangaManoj
a575d05a3e fix: Make fieldname more concise 2021-08-24 22:09:36 +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