Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,140 Commits 3 Branches 0 Tags 1 GiB
4766732b56
Commit Graph

2875 Commits

Author SHA1 Message Date
Anupam Kumar
ea5e155823
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-14 16:42:59 +05:30
Jannat Patel
74d086ffd1
Merge branch 'develop' into home-onboarding 2021-12-13 17:51:38 +05:30
ruthra
2813e5ee29 feat: new column 'Time taken to Deliver' in sales order analysis 2021-12-13 12:26:23 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Ankush Menat
6efbbb1058
fix: ignore mandatory fields while creating WO from SO (#28772) 
If fields are made mandatory from customizations the WO creation simply
fails.
 2021-12-07 16:26:14 +05:30
Anupam Kumar
3928a402d4
feat: CRM Settings (#27788) 
* feat: crm settings

* feat: CRM Settings

* feat: lead and opprtunity section

* feat: added CRM Settings in ERPNext Settings workspace

* fix: review chnages

* added patch

* fix: linter issues

* fix: linter issues

* fix: linter issues

* fix: removed crm settings from selling module

* fix: raw query to frappe.qb

* fix: removed hardcoded value

* fix: linter issue

* fix: simplify CRM Settings migration patch

Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-06 13:52:00 +05:30
Ankush Menat
105b6d498c fix: remove bad defaults from selling settings 
"All cusotmer groups" and "All territories" are pointless defaults, not
sure why these are made default. They don't help you track anything.
"All" might as well be `Null`.

Even the filters for customer_group suggest it shouldn't be group then
having the root as default makes no sense.
 2021-12-06 11:07:24 +05:30
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Ankush Menat
aeb62af544 fix(ux): remove attachment limits 2021-11-30 12:46:53 +05:30
Anupam Kumar
83e3e58fe9
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-11-30 10:11:23 +05:30
Subin Tom
2f6a6afaa8
feat(pos): Total item qty field to POS screen (#28331) 2021-11-29 20:35:49 +05:30
Anupam Kumar
d4f57d3a4f
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-11-29 12:15:03 +05:30
Jannat Patel
8cc1dc8079
Merge branch 'develop' into home-onboarding 2021-11-29 10:24:06 +05:30
Shariq Ansari
2a5f663a1e
fix: Customer, Supplier heatmap data not rendering (#28553) 
* fix: adding get_timeline_data import on supplier.py, customer.py
 2021-11-26 12:58:43 +05:30
GangaManoj
c9743185c6 fix: Remove unnecessary comma 2021-11-24 21:58:42 +05:30
GangaManoj
adfd519139 fix: Test Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 21:58:05 +05:30
GangaManoj
325923afc7 fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 2021-11-24 21:47:06 +05:30
Jannat Patel
5b2ba24563 fix: company tour 2021-11-24 19:19:45 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
Subin Tom
1909bb569e
fix: POS Item cart only taxes with amount displayed (#28501) 2021-11-23 10:35:43 +05:30
GangaManoj
406278b5c1 fix: Add bundle items to PO only if the Product Bundle was selected from the SO 2021-11-23 04:51:53 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier (#28387) 
* feat: create party link from customer/supplier

* test: create_party_link method
 2021-11-22 12:23:23 +05:30
Anupam
6210f10207 fix: linter issues 2021-11-19 10:32:04 +05:30
Anupam
6dda1548bc fix: linter issues 2021-11-19 10:22:50 +05:30
Anupam
6eb779392e feat: carry forward communication and comments throughout the sales cycle 2021-11-19 10:13:05 +05:30
Rohit Waghchaure
7472760ea3 fix: performance to submit the JV 2021-11-17 11:16:52 +05:30
marination
929a24ea5c feat: Cart minor UI/UX Refresh 
- Added Setting to show or hide price if checkout is disabled
- Show Web Item name in cart instead of Desk Item name
- Cart minor UI Refresh: added images in cart
- Cart minor UI Refresh: repositioned remove button and redesigned
- Cart minor UI Refresh: Payment Summary section
- Cart minor UI Refresh: Disable input on free item
- Cart minor UI Refresh: Add address button in cards
- New file for cart payment summary UI with coupon code (old)
 2021-11-16 17:03:17 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Deepesh Garg
ce06aaa0ae
Merge pull request #27735 from GangaManoj/fix-so-cancellation-message 
fix: Sales Order cancellation message
 2021-11-15 18:51:30 +05:30
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order (#28388) 
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-11-15 16:08:15 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person 
fix: commission rate not fetch from sales person
 2021-11-11 19:11:31 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation (#28050) 
* feat: Competitor Tagging in Opportunity and Quotation

* fix: review changes

* fix: linter issue

* fix: section label

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 19:36:27 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
marination
734b57deec fix: Serial Nos not set in the row after scanning in popup 
- Avoid whitspaces while calculating length of serial nos
 2021-11-02 18:34:55 +05:30
Deepesh Garg
051aaa708d fix: Ignore PO on So cancel 2021-10-29 11:35:34 +05:30
GangaManoj
1a9d2684e2 fix: Remove debugger 2021-10-28 19:27:45 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 14:44:34 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates 
feat: Taxes template for selling/buying doctypes
 2021-10-28 12:33:21 +05:30
Saqib
cc07c71bbd
Merge branch 'develop' into fix-so-cancellation-message 2021-10-27 15:19:18 +05:30
GangaManoj
4789c3423d fix: Linters 2021-10-27 05:25:32 +05:30
GangaManoj
07b25c4275 fix: Import statements 2021-10-27 05:20:31 +05:30
GangaManoj
54a0f5d04f fix: Make import statements fit conventions 2021-10-27 05:15:44 +05:30
GangaManoj
6dbc47f225 fix: Rename variables 2021-10-27 05:09:44 +05:30
GangaManoj
7454167725 fix: Remove redundant code 2021-10-27 05:08:11 +05:30
GangaManoj
69e011bf6a fix: Add test to check if SO can be cancelled after linked Work Order has been submitted 2021-10-27 05:07:16 +05:30
GangaManoj
9ec24d4915 fix: Add test to check if SO can be cancelled after linked Maintenance Visit has been submitted 2021-10-27 04:46:59 +05:30
GangaManoj
80ce3e6de7 fix: Add test to check if SO can be cancelled after linked Maintenance Schedule has been submitted 2021-10-27 04:17:21 +05:30
GangaManoj
60119f5ce5 fix: Remove redundant validations 2021-10-26 21:42:58 +05:30
GangaManoj
aac574579a fix: Add test to check if SO can be cancelled when linked DN has been submitted 2021-10-26 21:42:58 +05:30
GangaManoj
21798d8836 fix: Add test to check if SO can be cancelled when linked SI has been submitted 2021-10-26 21:42:58 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30
Deepesh Garg
e3ae8d5a1e fix: Move PAN field from standard doctype to fixtures for India 2021-10-24 17:24:25 +05:30
Faris Ansari
8b547e39a8 feat: Taxes template for selling/buying doctypes 
Depends on the new Print Format Builder
frappe/frappe#14134
 2021-10-21 12:06:02 +05:30
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
marination
fd6f3c6b88 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-10-12 18:24:21 +05:30
Ankush Menat
8d69ec72a6 fix: remove transaction commit from tests 2021-10-12 16:17:15 +05:30
marination
025574d9b5 chore: Removing Item's Website section & references 
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
 2021-10-12 16:03:19 +05:30
marination
eef9cf152f chore: Drive E-commerce via Website Item 
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
 2021-10-12 15:48:06 +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