diff --git a/addons/website_partner/__openerp__.py b/addons/website_partner/__openerp__.py
index fa113ba3a44..9584c4df3b1 100644
--- a/addons/website_partner/__openerp__.py
+++ b/addons/website_partner/__openerp__.py
@@ -33,6 +33,7 @@
'security/website_partner_security.xml',
'data/website_data.xml',
],
+ 'demo': ['website_partner_demo.xml'],
'css': [
],
'js': [
diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 842fde0e9e6..1567bb02a4a 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -17,12 +17,17 @@
- | Address | |
|---|
- | Website | |
|---|
- | Tel | |
|---|
- | Tel | |
|---|
- | Fax | |
|---|
- | Email | |
|---|
+ | Address | |
|---|
+ | Website |
+ |
|---|
+ | Phone |
+ |
|---|
+ | Tel |
+ |
|---|
+ | Fax |
+ |
|---|
+ | Email |
+ |
|---|
@@ -31,4 +36,4 @@
-
\ No newline at end of file
+
diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/website_partner_demo.xml
new file mode 100644
index 00000000000..bedd472cc2a
--- /dev/null
+++ b/addons/website_partner/website_partner_demo.xml
@@ -0,0 +1,248 @@
+
+
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ True
+
+
+
+ In business Nebula we have over 20 years of work in the field of "Software Engineering". Throughout this time we have served a large number of clients belonging to a diverse range...
+
+
+Throughout this time we have served a large number of clients belonging to a diverse range of issues.
+
+With our assistance we covered the various stages that make up a project, with a methodology that places the user at the center of the process and privileged agent.
+
+This path puts us uniquely equipped to lead projects implementation, training and customization of OpenERP.]]>
+
+
+
+ Agrolait is a specialized service provider for 10 years in the implementation of open source ERP , BI and e-commerce solutions. Audaxis has 100 employees based in France , Belgium, Luxembourg and Switzerland. Building on 20 years of...
+
+
+Building on 20 years of experience in ERP solutions , our consultants combine technological expertise , application and business to bring you informed throughout your OpenERP project board.
+
+Our project methodology , designed for SMEs / SMIs , is a quality assurance guarantee : architecture , installation, integration , customization, training , project management , support, maintenance , and migration , our commitment to you is total.
+
+Premium Partner PTC Agrolait is certified by OpenERP to provide functional and technical training in France and Tunisia.
+
+We operate in several sectors : distribution, retail , industry, services , associations, with strong expertise in the supply chain management (SCM) and the specific accounting for the Belgian and French markets . With its cluster of web expertise , Agrolait makes you benefit from the best advice in OpenERP integration with portals .]]>
+
+
+
+ OpenCorp is an IT services company specializing in the integration of open source hosted in the cloud for SMEs, small businesses, startups and professions libérales.Au seen technological advances solutions...
+
+
+In view of the technological advances that have fundamentally changed the expectations of users and ever increasing pressures on budgets, OpenCorp is aware that the level of demand of customers has never been higher.
+
+With over 20 years experience in information systems, the founders of OpenCorp were given a mission to shake up the market based on a catalog of effective, stable and affordable solutions to help its customers to gain competitive advantage.
+
+It is in this context qu'OpenCorp is today one of the first resellers of OpenERP 7.0 SaaS. Our philosophy "back to the standard" can significantly reduce the costs associated with project implementation.
+
+Experts in business analysis, our consultants will also accompany you in analyzing your needs by documenting your processes, identifying opportunities for improvement and preparing the mandates of your projects.
+
+With OpenCorp, you are guaranteed a controlled implementation of an operational and budgetary standpoint.]]>
+
+
+
+ China Export is committed to deliver a complete integrated business solution to fulfill your business requirements and meet your ever changing needs. China Export partners with OpenERP to build a feature rich, extensible...
+
+
+
+
+ Míng is a consulting firm with expertise in Finance and in Business Intelligence. (1) Outsourced financial director: implementation of flexible and customized data management system, financial reporting and KPI for an...
+
+
+(1) Outsourced financial director: implementation of flexible and customized data management system, financial reporting and KPI for an easy decision making process.
+
+(2) Outsourced financial task force: set-up of business plan, zero budget, company valuation, audits on internal controlling.
+
+(3) All-included administrative and financial support package:
+a. Setting-up: support for getting the relevant business license and meeting the associated administrative PRC requirements.
+b. Management: definition and implementation of procedures, proposal on the company organization.
+c. Finance: bookkeeping, tax declaration, financial reporting and key indicators.
+d. Decisional Information System: set-up of server, network, implementation of a customized data management system (OpenERP, Excel).
+e. Human resources: recruitment, payroll management.]]>
+
+
+
+ Axelor is a service company specializing in the integration of Open Source ERP. She is co-editor including the web version of Open ERP and concentrates all its activities to OpenERP integration and implementation of supply...
+
+The company has its own R & D performing many innovations to the continuous improvement of Open ERP, such as the new web version, the plug-in MS Office and connectors to other applications. Its main advantages are its integration methodology and rigor to the management of major projects for the audit and design phase up to production and customer support.]]>
+
+
+
+ Founded in 2001, Camptocamp is OpenERP Gold Partner since 2006 in Switzerland, France and Austria and has about 50 employees all Professional Open Source...
+
+Camptocamp specializes in the implementation of OpenERP in companies of 10 to several hundred employees in the following areas:
+- trading (buy / sell / stock), especially in the field of e-commerce;
+- service companies;
+- nongovernmental organizations (NGOs) of international humanitarian rank.
+Camptocamp has developed a strong expertise in the following areas:
+- finance :
+- Swiss localization, French and Austrian;
+- multi-company and multi-currency environments;
+- rapports financiers (WebKit Reports) ;
+- Bank Automation: import bank statements, pre-filling of the accounts, lettering mass;
+- logistics:
+- automation with showers and barcode: scenarios to scan receipts, shipments, internal movements, inventories, manufacturing... ;
+- specific issues multi-inventory tracking and offline synchronization;
+- e-commerce :
+- Magento OpenERP connector (bidirectional) to synchronize orders, customers, products, prices, payment methods and delivery, shipping... ;
+- PrestaShop OpenERP connector;
+- development and implementation of business applications 100% specific leveraging the power of the OpenERP framework (OpenObject).
+
+In addition, thanks to its heavy involvement in the ecosystem OpenERP for several years, has been promoted by Camptocamp Editor OpenERP SA status OpenERP best contributor in 2012 and 2013.
+]]>
+
+
+
+ 3 good reasons to choose today for Federal as partners for the implementation of your ERP project: Firstly, you have a software specialist, secondly, a hardware and performance specialist AND thirdly a business economist with expertise in project management. And...
+
+… Your individual requirements are mapped into the standard software
+… professional design of the optimal sizing for your system landscape
+… Understanding of commercial and logistical processes in your business and engaging your staff and efficient use of resources.
+Above all, you need a reliable and professional advisors / companions who will listen, your challenges seriously and will implement it in your senses. And without you fool with limit time and on budget, an X for a U. Welcome to Federal ]]>
+
+
+
+ We offer implementation, customization and training for OpenERP. Since tinyerp 4, we also develop custom modules. In addition to individual solutions are preconfigured systems for: - ...
+
+- Food production (eg fruit and vegetables)
+- Service provider with project management
+- Machinery and equipment manufacturers]]>
+
+
+
+ Luminous is a technology company, dynamic, innovative and agile Business Management develops solutions through its own system of Artificial Intelligence "NEUROVIP" NEUROVIP convie is a system that...
+ Luminous is a technology company, dynamic, innovative and agile Business Management develops solutions through its own system of Artificial Intelligence "NEUROVIP".
NEUROVIP is a system that converts data from Enterprise Management tools (ERP's, CRM's, DMS's, GMP's, etc..) Into relevant information for Strategic Decision Making Company.
+
+Luminous with its own artificial intelligence system "NEUROVIP" addresses all types of organizations, whether public or private sector.
+
+Its usefulness is that strategic decisions in a timely and efficient manner to achieve business competitiveness to globalization and its environment.
+
+NEUROVIP consists of three phases:
+Phase 1: In the first phase analyzes the user-defined data.
+Phase 2: In the second phase Know feeding information to social and / or business.
+Phase 3: In the third phase recommends prioritizing specific interests of the company.]]>
+
+
+
+ Bank Wealthy and sons has developed expertise in all areas of OpenERP, working with clients to create accounting, invoicing, VAT, and reporting customisations to fulfil their business needs. Bank Wealthy and sons work closely with the OpenERP community to send changes upstream to further enhance OpenERP. Providing a full range...
+
+
+Providing a full range of free software services for the private and public sectors since 1998, Bank Wealthy and sons is now one of the largest independent open source consultancies, with Open Source Support Centres in the UK, Germany, the US and Canada. With a worldwide team of over 40 free software developers, including many active OpenERP contributors, Bank Wealthy and sons is Your One-Stop Shop for Open Source Support™.]]>
+
+
+
+ Global Solutions helps organisations of all shapes and sizes gain a competitive advantage through Free and Open Source software. Our experienced team can provide strategic advice, implementation, integration with exis...
+
+Founded in 2006, our clients range from SMEs to globally recognised brands and public sector organisations.]]>
+
+
+
+ Millennium Industries is a London based OpenERP partner. Their specialist areas include accounting, CRM, manufacturing, stock, logistics, and supply chain management. The company has completed over 15 projects with intric...
+
+
+Millennium Industries have developed several accounting modules for OpenERP and are the leading experts in the UK for this area. Additionally, a forefront success story of theirs is the nominal level data migrations from Sage Line 50 to OpenERP that allows unprecedented efficiency in system switchover.
+
+Last but not least, Millennium Industries is the only UK partner with their own Europe-based fully staffed development centre, aimed to deliver to the exact client specification projects of any complexity.
+Please contact Millennium Industries direct to discuss your business requirement and the company would be delighted to help.]]>
+
+
+
+ The Jackson Group is an active and leading partner of OpenERP in the US. As OpenERP's longest active US partner, we help our clients leverage new methods, cost-effective tools and fresh technologies to simplify infrastructure, lower cost, and improve operations. Our goal is to help our clients become...
+
+Our goal is to help our clients become high-performing, competitive and profitable businesses.
+We leverage robust model that combines:
+-
+Implementations of feature rich, extensible, and cost-effective Open Source software (OpenERP)
+- Experienced consulting services
+- Domestic US, near-shore and offshore based resources
+- A highly-responsive support model
+- A strategy that drives US Localization and adds new capabilities to OpenERP
+
+
+The Jackson Group’s OpenERP consulting services include:
+ -
+Roadmap Development
+- Program/Project Management
+- Process Analysis
+- Implementation and Configuration (on-premise or on-demand environments)
+- Data Migration
+- Programming and Custom Module Development
+- Training
+- Support
+- Managed Services
]]>
+
+
+
+ We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide. At Think Big Systems we bring operational experience combined...
+
+At Think Big Systems we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.]]>
+
+
+
+ Best Designers is an IT services organization, established by 3 industry experts headquartered at Mumbai, India. The organization serve customers with Open Source Enterprise Software applications. We are specialized in...
+ ERP Implementation, CRM Implementation, E-Commerce to ERP Integrations, Document Management Systems and Open Source Training. Our key products include OpenERP, Alfresco and Magento. Our core objective is to deliver quality in OpenERP Implementation Services incorporating supreme value to enterprises globally, at an affordable price. Our experience in managing projects right from selecting tools and platforms to implement solutions has shown results in Reducing IT Budgets for SME making Technology Affordable.
+
+Our ERP expertise is since 2005 and we mainly focus on OpenERP Implementation across the globe, being an Off-shore Development Partner from India, we are also associated with other OpenERP Partners across the globe to implement OpenERP Business Applications. In order to provide world class ERP, E–Commerce and Enterprise Solutions, we have designed innovative Implementation Methodologies and concepts, which help us provide reliable business solutions that meet present as well as future demands.
+
+Best Designers has now emerged serving the Small and Medium Business – SMB’s with lots of Free and Open Source Software's, Our team is proficient to deliver quick and quality solutions. With a blend of experts with proven track record, our enterprise solution Business Consultants, ERP Consultants, Network Engineers, Software Developers, Web Architects, Software Testers and Search Engine Optimizers makes it possible to offer our clients affordable solutions that are both innovative and highly influential.
+]]>
+
+
+
+ none
+
+
+
+ none
+
+
+
+ none
+
+
+
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 9e2e2cdbdd9..b968b415e22 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -14,9 +14,11 @@
Task
@@ -43,6 +45,7 @@
Project
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 4139e229f07..23a36e1d57f 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -43,7 +43,6 @@ class CheckoutInfo(object):
class Ecommerce(http.Controller):
_order = 'website_sequence desc, website_published desc'
- domain = [("sale_ok", "=", True)]
def get_attribute_ids(self):
attributes_obj = request.registry.get('product.attribute')
@@ -281,7 +280,7 @@ class Ecommerce(http.Controller):
self.change_pricelist(post.get('promo'))
product_obj = request.registry.get('product.template')
- domain = list(self.domain)
+ domain = request.registry.get('website').get_website_sale_domain()
# remove product_product_consultant from ecommerce editable mode, this product never be publish
ref = request.registry.get('ir.model.data').get_object_reference(request.cr, SUPERUSER_ID, 'product', 'product_product_consultant')
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 3d2d1b30631..7fa1d7c5f1e 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -122,3 +122,7 @@ class Website(orm.Model):
order.write(values)
for line in order.order_line:
self.add_product_to_cart(order_line_id=line.id, number=0)
+
+
+ def get_website_sale_domain(self):
+ return [("sale_ok", "=", True)]
\ No newline at end of file
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 2c4fd193715..70250b39f77 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -245,7 +245,7 @@
- Products