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

2765 Commits

Author SHA1 Message Date
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
Ankush Menat
8d69ec72a6 fix: remove transaction commit from tests 2021-10-12 16:17:15 +05:30
mergify[bot]
e85c6e3fc5
fix: SO delivery Date not getting set via data import (#27862) (#27864) 
* fix: SO delivery Date not getting set via data import

* fix: logic to add delivery dates

* fix: linting issue

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
(cherry picked from commit d9a219850a02539f82929b5d5490554835fcde8b)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-10-08 13:19:56 +05:30
Afshan
4c16bd5c73
Merge branch 'develop' into fix-so-cancellation-message 2021-10-05 11:52:48 +05:30
Komal-Saraf0609
b483f173a6
fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button (#27769) 
* fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it

* fix: sider issues

* chore: dead code
 2021-10-04 15:42:43 +05:30
GangaManoj
6e5a3c0ea4 fix: Display draft invoices only once in error message 2021-10-02 02:15:17 +05:30
GangaManoj
99edc9c83a fix: Display message to delete linked invoices in the draft state 2021-10-02 02:03:29 +05:30
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
Abdullah A. Zaqout
6d8e869a92
fix(pos): check if item exists before fetching available qty (#27581) 2021-09-20 21:35:37 +05:30
GangaManoj
8396f24e70 fix: Unlink PO on cancelling SO 2021-09-20 19:01:46 +05:30
Deepesh Garg
759f2b7920
fix: Autoname for customer and supplier (#27398) 2021-09-15 10:24:26 +05:30
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items 
feat: link items to supplier / customer
 2021-09-14 13:58:18 +05:30
Deepesh Garg
c7ceb37b63
Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix 
fix: cancelled sales invoices are considered in billed qty calculation
 2021-09-14 10:05:36 +05:30
Saqib Ansari
44139fbac5 fix: cancelled sales invoices are considered in billed quantity calculation 2021-09-13 16:50:11 +05:30
Saqib
a5baf909b7
fix: editable price list rate field in sales transactions (#27455) 2021-09-13 15:50:20 +05:30
Subin Tom
8b4c57ee09
fix: pos payment mode selection issue (#27409) 2021-09-09 19:33:34 +05:30
Saqib
98696c0ec9
Merge pull request #27306 from GangaManoj/fix-selling-settings 
fix: Move related fields together in Selling Settings
 2021-09-03 12:30:02 +05:30
GangaManoj
ebdc568e85 fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' 2021-09-02 19:32:51 +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
366012817f
Merge branch 'develop' into fix-selling-settings 2021-09-02 11:13:52 +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
GangaManoj
799d67d785 fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked 2021-09-01 22:55:10 +05:30
GangaManoj
f2a7fbd126 fix: Remove redundant description 2021-09-01 22:49:05 +05:30
GangaManoj
06484321d1 fix: Move related fields to the same section 2021-09-01 22:48:09 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
GangaManoj
bbb9fa4bf8 fix: Remove Rate from field_no_map 2021-09-01 16:00:59 +05:30
GangaManoj
471fd9718c fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO 2021-09-01 15:36:07 +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
GangaManoj
17a6a9b036 fix: Uncheck read-only for Packed Items table 2021-09-01 15:13:29 +05:30
GangaManoj
0e457265b7 fix: Test Product Bundle price calculation 2021-09-01 02:50:29 +05:30
GangaManoj
0c3d3bb357 fix: Test if Product Bundles are mapped properly on creating a Sales Order 2021-09-01 02:33:53 +05:30
GangaManoj
912bfb234f fix: Test if Product Bundles in SOs are replaced with their child items on creating POs 2021-09-01 02:09:46 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-31 22:08:10 +05:30
GangaManoj
65796853f3 fix: Map Packed Items to Items table of PO 2021-08-31 20:31:22 +05:30
Afshan
763450dcf8
Revert "fix: add child item groups into the filters (#26997)" (#27266) 
This reverts commit c60d5523bc.
 2021-08-31 19:07:20 +05:30
GangaManoj
eb24e87637 fix: Replace Product Bundles in the Items table with their child items 2021-08-31 18:44:29 +05:30
Frappe PR Bot
6281c33dd4
fix: pos payment methods not setting rounded_total (#27260) 2021-08-31 18:39:51 +05:30
Marica
fbcf82f788
Merge branch 'develop' into supplier-primary-address 2021-08-30 12:51:37 +05:30
marination
7b78473da3 fix: Indentation and removed f-strings 
- Sider: fixed indentation in js
- Dont use f-strings in queries
 2021-08-30 12:50:24 +05:30
GangaManoj
e44567754d fix: Display Packed/Bundle Items table only if it exists 2021-08-27 20:16:13 +05:30
GangaManoj
a2b394b195 fix: Enable Print Hide for Bundle Items 2021-08-27 20:06:22 +05:30
marination
2a3ef03388 fix: Popup stale build and data consistency 
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry)  in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
 2021-08-27 18:06:51 +05:30
Anupam Kumar
212921aace
Merge branch 'develop' into prospect 2021-08-27 15:57:10 +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
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 14:48:54 +05:30
GangaManoj
535dd2d36d fix: Move Packed Items table right below the Items table 2021-08-27 02:47:11 +05:30
GangaManoj
4353c5e339 fix: Disable Add Row and Delete Row for Bundle Items 2021-08-27 02:32:34 +05:30
GangaManoj
bdbd4f83ab fix: Create separate section for Bundle Items 2021-08-27 02:29:47 +05:30
GangaManoj
6c03af815e fix: Display Bundle Items right below the Items table 2021-08-27 01:14:23 +05:30
Pawan Mehta
db69d1dc00
fix: fetch from more than one sales order in Maintenance Visit (#26924) 
* [fix] #26336

* fix(ux): make customer field reqd for fetching SO

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 22:54:24 +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
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
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
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
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle 2021-08-25 00:55:47 +05:30
GangaManoj
1d82c3effe fix: Make Rate editable if editable_bundle_item_rates is checked 2021-08-24 22:25:59 +05:30
GangaManoj
a575d05a3e fix: Make fieldname more concise 2021-08-24 22:09:36 +05:30
GangaManoj
2293ba302a fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates 2021-08-24 22:04:03 +05:30
GangaManoj
8af5802e42 fix: Populate Bundle Items table 2021-08-24 17:58:23 +05:30
GangaManoj
91af0d6ffb fix: Add Bundle Items table 2021-08-24 17:57:55 +05:30
Anupam
4a529f8039 feat: Prospect 2021-08-24 09:35:59 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no 2021-08-23 18:07:22 +05:30
Rohit Waghchaure
e1f070437a fix: selected batch no changed on updation of qty 2021-08-23 14:27:55 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Afshan
c60d5523bc
fix: add child item groups into the filters (#26997) 
* fix: add child item groups into the filters

* fix: appending values to proper variable

* fix: refactor the loop
 2021-08-19 16:23:18 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Ankush
c1c9c4b68e
Merge branch 'develop' into fix_dn_test 2021-08-11 11:40:15 +05:30
Saqib
b37c6992df
Merge branch 'develop' into po-payment-terms 2021-08-10 13:37:31 +05:30
Anurag Mishra
94beda65ca
fix: updating lead status while customer creation (#26606) 
* fix:  updating lead status while customer creation

* fix: changes requested
 2021-08-10 13:16:46 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms 2021-08-10 09:32:08 +05:30
Deepesh Garg
802c6b3738 test: Improve test case for not coping payment terms 2021-08-09 18:53:15 +05:30
GangaManoj
55cb82c74d fix: Compare Payment Schedules 2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-09 18:53:13 +05:30
Anupam Kumar
2f06c3e40d
Merge branch 'develop' into lead-cleanup 2021-08-09 16:07:04 +05:30
Anupam Kumar
ef8539fd60
refactor: Selling Settings form cleanup (#26841) 2021-08-09 12:38:14 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Anupam
01a0585ba0 fix: removing organization_lead traceback 2021-08-06 12:21:02 +05:30
Subin Tom
035ce304fe
fix: POS payment modes displayed wrong total (#26708) 2021-08-04 13:57:55 +05:30
Subin Tom
3b7615750a
fix: POS Item Cart non-stop scroll issue (#26692) 2021-08-02 11:37:38 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms 2021-07-29 17:23:09 +05:30
Anupam
ee1089ca4f Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module 2021-07-27 16:49:24 +05:30
Anupam Kumar
34353df48c
fix: sales pipeline graph issue (#26626) 2021-07-27 09:47:44 +05:30
Ankush Menat
03a6c38f06
test: fix test due to rename change 2021-07-26 22:24:25 +05:30
GangaManoj
add2030553 fix: Sider issues 2021-07-23 03:58:27 +05:30
GangaManoj
aed39a23dc fix: Rename tests 2021-07-23 03:45:59 +05:30
GangaManoj
caa106b3bd fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-22 22:58:45 +05:30
GangaManoj
4323f4bcac fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-22 05:57:42 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
GangaManoj
cde0cc0678 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-17 22:53:21 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field (#26495) 2021-07-15 18:10:17 +05:30
Subin Tom
5265ba39f0 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-07-13 14:58:17 +05:30
Saqib
7c5711ddf4
fix: pos item cart dom updates (#26459) 2021-07-13 14:09:06 +05:30
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix 2021-07-13 10:31:10 +05:30
Noah Jacob
0be6583083 refactor: suggested changes 2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106 fix: Sider 2021-07-12 08:48:04 +05:30