Commit Graph

2708 Commits

Author SHA1 Message Date
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
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
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