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
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )
...
* Shipping rule for Buying
* [refactor] shipping rule
2017-11-17 14:31:09 +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
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Nabin Hait
bb60a59b96
Fixed asset test cases due to tax rule ( #11247 )
...
* Fixed asset testcases due to tax rule
* Delete tax rule record after running test cases
* Fixed test cases
* Fixed test cases
* Fixed subscription tests due to tax rule
2017-10-19 12:14:37 +05:30
tunde
d82677f1e6
Merge branch 'develop' into payment-terms
2017-10-06 02:23:45 +01:00
Faris Ansari
fd345f8e90
Hub ( #10934 )
...
* [WIP]Hub
* [listing] Show items, users and item_groups
* Show filters
* [start] cart, api for rfq and opp
* rfq working
* [wip] keys
* wip quotes
* [hub] register/unregister
* [hub] rename password to access_token, remove passed company field
* [hub] publishing cases, api call wrapper
* [hub] add and remove fields working
* [hub] fix flags, update on client save working
* [hub] new hub page, client item CUD at hub working
* listing, standard rate, local site hack
* item listing, item page, search, back to home
* [hub] implement hub company
* [hub] company filter
* [hub] basic rfq-ing, item page cleanup
* categories wip
* [hub] use get_doc_before_save()
* [hub] send opportunity message to hub, api to make locally
* [hub] enqueueing in hub api request wrapper
* cleanup
* [hub] refactor shopping cart's product.py to reuse
* sync dynamic item fields daily
* Scheduler heartbeat check
* [wip] hub categories
* [hub] wip enqueued callbacks
* [hub] outgoing messages, fixing callback loop
* [hub] bug: callback save after primary save
* [hub] pricing, stock, currency
* [hub] replace send_hub_request with make_and_enqueue
* add hub.less, refactor code
* Remove template html files, add styling for hub item cards
* fix paging
* add breadcrumb
* Add sidebar
* [hub] add company page, change country
* [hub] order_by filters
* [hub] make hub category a tree
* [hub] enqueue batched item enqueueing
* [hub] requested products page
* [minor]
* update hub url
* [fix] url
* [fix] more reform
* fix recursion
* [hub] data migration plans as jsons
* Hub register, create data connector, sync with run
* [add] user registration by session user
* Removed hub_message
* Remove sync code from hub_settings
* Remove hub methods from item.py
* Update Hub Sync plan
* Hub unregister
* Update Hub connector on reregister
* Dont delete Hub Connector on unregister
* Enable hub on success response
* Add new hub whitelisted methods
* [hub] list working
* Hub register from hub page
* [hub] Add hub logo in desk icon, link to page
* [hub] hide page head on empty state
* [hub] make rfq
* [hub] push opportunity doc, poll for opportunity docs
* add fields to item mapping
* update hub mappings
* Make RFQ
* [hub] item, home routing
* Make rfq and send opportunity refactor
* [hub][fix] remote lead data
* images passed as base64
* set default company on register
* Revert "images passed as base64"
This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4.
* Add sync to hub page
* Prompt for publish items to hub
* add post process to hub document to lead
* Rename Hub document to Hub message, create opportunity in post process
2017-10-05 11:17:30 +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
Saurabh
3a4b6c2cba
[fix] redirect to payment url if paying via web portal ( #10265 )
...
* [fix] redirect to payment url if paying via web portal
* [fix] test case fix
* [fix] test case fixes
2017-08-08 11:29:11 +05:30
mbauskar
f3be738b68
resolved merge conflicts
2017-08-04 11:07:07 +05:30
Nabin Hait
5ebb9a0fc7
Merge pull request #10259 from pratu16x7/hotfix
...
[hotfix] website stock not shown due to discount not set
2017-08-03 10:19:13 +05:30
pratu16x7
7587b19d1b
[fix] website stock not shown due to discount not set
2017-08-02 22:14:51 +05:30
KanchanChauhan
58c9934452
[fix] company graph based on base currency ( #9950 )
2017-07-26 18:17:11 +05:30
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
Charles-Henri Decultot
2de1cd3529
View Attachments in portal ( #8830 )
...
* View Attachments in portal
* HTML beautify correction
* Move option to shopping cart settings
* new field in shopping cart settings for public attachments display in portal
2017-05-19 16:04:10 +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
Felipe Orellana
0952df29dc
Update product.py ( #8877 )
...
Hi!
If template_item_code is None on line 71-72 the query will return ALL "Item Price" records irrespective of item_code, potentially causing the wrong price list rate to be used.
Noticed this behavior when fetching product price for a group of items without "variant_of" data.
2017-05-17 19:20:01 +05:30
Nabin Hait
00b04ed61e
Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
...
Show qty in Shopping Cart
2017-03-24 13:14:03 +05:30
Kanchan Chauhan
a844040781
Show qty in Shopping Cart
2017-03-23 18:22:02 +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
Rushabh Mehta
8f55d6bf3a
[fix] test_shopping_cart.py
2017-01-17 22:15:17 +05:30
Rushabh Mehta
982be9f11b
[tests] fixed for shopping cart
2017-01-17 17:57:38 +05:30
Rushabh Mehta
592104ef68
[fix] tests
2017-01-17 12:06:53 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Rushabh Mehta
4ad121e1a4
[minor] fixes for Contact
2017-01-16 12:19:21 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
aa0d174d3d
Replaced spaces with tabs
2016-12-08 15:44:16 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
2c1f399479
Apply Pricing Rule in Shopping Cart
2016-11-22 22:23:31 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Chude Osiegbu
4a0c840076
Fixing a regression in shopping_cart_settings that was caused by the change in structure of Currency Exchange Doctype
2016-09-20 19:34:10 +01:00
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Nabin Hait
29d85b0ab8
test case fixed
2016-06-01 12:54:26 +05:30
Nabin Hait
9a5cf6000e
[fix] Test cases and editable fields settings for request for quotation
2016-06-01 12:54:26 +05:30
Rushabh Mehta
7c96dc1783
[minor] [fix] cart
2016-05-16 11:36:08 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Rohit Waghchaure
ae270d6648
[Fixes] Supplier can view their addresses, default buying price list issue
2016-04-11 13:58:33 +05:30
Nabin Hait
adddf6f471
[fix] Test cases
2016-04-01 16:47:46 +05:30
rohitwaghchaure
62fea0374b
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
2016-03-31 21:49:07 +05:30
Rushabh Mehta
b04409746e
[fix] tests
2016-03-31 16:55:21 +05:30
Rushabh Mehta
acf28af19c
[fix] set default depreciation accounts and test fix
2016-03-31 15:04:06 +05:30
Rushabh Mehta
c78b3110b5
[enhancement] configurable portal menu;
2016-03-30 12:29:48 +05:30
rohitwaghchaure
a1064a6149
[enhancement] request for quotation
2016-03-28 17:28:45 +05:30
Rushabh Mehta
bd8d288255
Merge pull request #4993 from KanchanChauhan/collaborativeprojectmanagement
...
[WIP] Collaborative Project Management first commit
2016-03-23 12:02:22 +05:30
Anand Doshi
a75fe1a4c3
Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"
2016-03-23 11:59:24 +05:30
Anand Doshi
71b90b7b7d
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
2016-03-21 17:50:02 +05:30
Saurabh
b43df36e85
[fixes] return debtors account name
2016-03-18 15:05:50 +05:30
Kanchan Chauhan
b3fe6a45a7
WIP Collaborative Project Management first commit
2016-03-16 18:34:33 +05:30
Saurabh
4a6bbf9b72
[fixes] added filters company and currency to get account, removed account name wise comparison
2016-02-24 15:07:26 +05:30
Saurabh
3a2682919a
[enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable
2016-02-24 15:07:25 +05:30
Saurabh
dca6302e15
[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment
2016-02-24 15:07:24 +05:30
Saurabh
883cc04701
[fixes] compare attributes in lower case
2016-02-24 15:07:24 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Saurabh
403ad48364
[fixes] display cart count only if item exist in cart
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Anand Doshi
cc24d28ddc
[fix] address creation for new user
2015-12-08 12:34:13 +05:30
Anand Doshi
558646c6b8
[fix] ignore mandatory when creating customer and contact in cart
2015-10-20 18:57:38 +05:30
Anand Doshi
7c0eadb451
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
2015-10-20 17:30:02 +05:30
Rushabh Mehta
6e322d0a02
[enhancement] use thumbnails in grid views, patch to make thumbnails
2015-10-14 16:21:24 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Rushabh Mehta
307978fea9
[test-fixes]
2015-09-23 15:43:09 +05:30
Anand Doshi
06ad308ca1
[fixes] setup wizard and other fixes related to cart
2015-09-23 12:50:35 +05:30
Rushabh Mehta
72fbf902d7
[cleanup] added single price list for shopping cart, removed Applicable Territory
2015-09-23 12:50:34 +05:30
Rushabh Mehta
8ffd483e24
[wip] shopping cart shipping rule, price list cleanup
2015-09-23 12:49:16 +05:30
Rushabh Mehta
3d76686b82
[shopping-cart] cart via Jinja WIP
2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2
[cleanup] [wip] portal, shopping cart cleanup
2015-09-23 12:49:16 +05:30
Saurabh
bb9427d1ef
[Fixes] deprecated
2015-09-15 15:41:01 +05:30
Saurabh
7c867ae9ad
[Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation
2015-09-15 15:41:01 +05:30
Saurabh
8f7317175d
[enhancement] bring taxes from tax rules and test cases
2015-09-15 15:41:01 +05:30
Saurabh
957e7a37be
[Shopping Cart][Fixes] tax calculation based on tax rule
2015-09-15 15:41:01 +05:30
Saurabh
def71d4d5d
[Shopping Cart][Fixes] tax calculation based on tax rule
2015-09-15 15:41:00 +05:30
Anand Doshi
8b66f2a691
Exported all doctypes
2015-08-27 16:45:52 +05:30
Anand Doshi
e6f7ac961f
[fix] Add to Cart visibility, Customer's Price List in Shopping Cart and Address creation from Shopping Cart
2015-07-13 16:24:37 +05:30
Anand Doshi
f7c1743b28
[hotfix] cart - get_address_docs
2015-06-02 15:20:25 -04:00
Rushabh Mehta
a33d468d30
[fixes] portal, issues, addresses etc
2015-06-01 17:15:42 +05:30
Anand Doshi
438b67e8b0
[fix] shopping cart - get price list for default territory if no price list is selected
2015-05-26 17:37:39 -04:00
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Anand Doshi
da858cc587
Website Product Image
2015-02-24 17:52:09 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
eca7e22cda
Shopping cart test fixed
2014-12-02 11:35:29 +05:30
Nabin Hait
0d421c1bf1
Minor fixes
2014-11-03 15:46:15 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
