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

90 Commits

Author SHA1 Message Date
Sagar Vora
da22744e0f
fix: specify fields to be set in Lead (#28288) 2021-11-09 15:49:32 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +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
Ankush Menat
993b0532f8
Merge pull request #27026 from ankush/eq_assign 
fix: equality check instead of assignment


[skip ci]
 2021-08-19 15:43:34 +05:30
Ankush Menat
adf974810d
fix: equality check instead of assignment in cart 2021-04-16 21:15:50 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
marination
e2d0715cdf fix: Server side validation for missing payment gateway account 2021-02-11 19:06:10 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes (#24445) 
* feat: shopping portal changes

* fix: review changes

* review changes
 2021-01-28 17:32:57 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
Suraj Shetty
ad57eef40c
fix(product-listing): Check if customer exists (#24030) 
- It might happen that perty_name might not always be Customer
(it might be Supplier as well)
 2020-12-01 09:14:57 +05:30
Anupam
dd2f547c3b fix: Ui fixes 2020-09-24 16:37:08 +05:30
Anupam
78ee75d744 fix: review changes 2020-09-24 16:17:02 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-17 10:53:13 +05:30
Marica
2112834743
fix: Handle unavailable Variants in Website (#22195) 
* fix: Handle unavailable Variants in Website

* fix: Fetch cart setting from argument
 2020-06-16 00:20:57 +05:30
marination
fdddb679ed fix: Prioritize Default Customer Price List in Portal 2020-06-10 18:22:59 +05:30
Marica
1392489b60
fix: Item Price and Add to Cart not showing on Website (#21903) 
* fix: Item Price and Add to Cart not showing on Website

* fix: Use None as default argument
 2020-05-25 18:26:01 +05:30
Rohan
200af04657
format: better error messages for invalid coupon codes (develop) (#21599) 
* format: better error messages for invalid coupon codes

* fix: remove unnecessary docstatus check
 2020-05-15 12:10:34 +05:30
Myuddin khatri
b9631a501f fix(shopping-cart): setting billing and shipping address 
setting billing and shipping address
 2020-03-12 16:21:38 +05:30
Myuddin khatri
4635ff9368 fix(shopping-cart): address is made mandatory to place order 2020-03-12 14:45:08 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Saqib
707b83940a fix: due date before posting date for items added to cart yesterday (#19681) 2019-11-28 18:27:17 +05:30
Sahil Khan
1c44bb0982 fix(cart): return rule instead of rule_label_map 2019-11-07 12:38:05 +05:30
Shivam Mishra
d743583bf4 fix: contact creation and fetching for shopping cart (#19510) 2019-11-06 18:03:03 +05:30
Ashish Shah
e1f95c0529 fix: allow_items_not_in_stock should be evaluated (#19398) 2019-10-25 12:16:11 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
Roland
6edce82aef do not require address in webshop (#19096) 
fix: #17559 - in webshop adding address should not be mandatory e.g. for online service goods, button to add address remains available
 2019-09-30 10:56:22 +05:30
Faris Ansari
a2db94761a fix: Honor Shopping Cart Price List (#18885) 2019-09-05 12:19:50 +05:30
Deepesh Garg
65ad4287b6 fix: Customer price list not honored in shopping cart (#18557) 2019-08-05 10:10:38 +05:30
Deepesh Garg
397013ec92 fix: Fix for customer lead merging in Quotation (#18294) 2019-07-12 14:51:01 +05:30
Faris Ansari
76afcf4cba fix: Honor price list in Shopping Cart Settings 2019-07-03 19:23:12 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-22 16:20:40 +05:00
ks093
61c781325d
Fix to show low stock message. 
In case of order being placed with stock quantity more than available, message showing stock available wasn't showing due to tuple unpacking not happening correctly.
 2019-01-17 12:16:43 +05:30
Saif Ur Rehman
13a6c0aeff Fix tests 2019-01-06 18:14:18 +05:00
rohitwaghchaure
0f5c18ca81 [Fix] For non stock item, not able to place an order from shopping cart (#12758) 2018-02-05 12:25:02 +05:30
Vishal Dhayagude
e04aedadcd [fix] Add to cart issue fixed (#12474) 2018-01-15 14:01:05 +05:30
Nabin Hait
32a62a02df Fixed merge conflict 2017-11-21 20:18:03 +05:30
Britlog
1484793055 Shopping cart addresses management (#11657) 2017-11-20 11:22:18 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms 2017-11-17 12:41:56 +05:30
Britlog
d9978d9c4f Check stock in shopping cart (#11529) 2017-11-16 18:38:13 +05:30
tunde
94c3c13ba6 fix failing tests 2017-09-25 14:47:48 +01:00
tunde
90e09d4e79 fix failing tests from shopping cart 2017-09-25 11:27:32 +01:00
Britlog
faf75c4ddd Fix and improve shopping cart (#9348) 
* Fix and improve shopping cart

* Update shopping_cart.js

* Update shopping_cart.js
 2017-06-20 12:51:32 +05:30
KanchanChauhan
1dc26b127b Salutation and Gender in Lead and Customer (#9199) 2017-06-13 15:26:35 +05:30
gmplab
7607cc9dfa try to fix #997 ,when cart is disabled, it will not show error and it will dedirect to 'contact' page (#8636) 2017-05-18 12:41:19 +05:30
mbauskar
67e3e32dd6 [minor] fixed shipping and billing address issue in cart 2017-03-22 16:14:43 +05:30
Rushabh Mehta
a0c41b70c4 [fix] tax rule test 2017-01-18 14:14:20 +05:30