From f7e89a0224f6845c098c0c4d78a641c08faa3d15 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 14 Oct 2013 17:39:19 +0530 Subject: [PATCH 01/55] [IMP]Create membership demo data. bzr revid: bth@tinyerp.com-20131014120919-95e61zshhg2bi1b3 --- addons/membership/membership_demo.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index 852a9dbf2e0..fd7d3f29afb 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -42,8 +42,13 @@ + + + + + From 8d3068042dc612160562335e0cd64d12b2f1c893 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 14 Oct 2013 18:36:40 +0530 Subject: [PATCH 02/55] [IMP]Created grade, assigned partner into grade and assigned customer references. bzr revid: bth@tinyerp.com-20131014130640-87nz3eqtdy08pu1q --- .../crm_partner_assign/res_partner_demo.xml | 81 ++++++++++++++++++- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 633a5094722..963748e5bf1 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -1,17 +1,92 @@ - - First + + Bronze 1 + + Silver + 2 + + + Gold + 3 + + + Platinium + 4 + + - + + 10 + + + + 10 + + + + 10 + + + + + 10 + + + + 10 + + + + 10 + + + + + 10 + + + + 10 + + + + 10 + + + + + 10 + + + + 10 + + + 10 + + + + + + + + + + + + + + + From 2aff4eba05d9087b3bdce6bcca63b4669a6aee46 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 15 Oct 2013 18:11:41 +0530 Subject: [PATCH 03/55] [IMP]Added partner's descriptions in demo data. bzr revid: bth@tinyerp.com-20131015124141-hk1lq48y51fq5rhm --- .../views/website_customer.xml | 2 +- addons/website_partner/__openerp__.py | 1 + .../website_partner/website_partner_demo.xml | 265 ++++++++++++++++++ 3 files changed, 267 insertions(+), 1 deletion(-) create mode 100644 addons/website_partner/website_partner_demo.xml diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index efc31d6f2a5..6f82ed084b0 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -68,7 +68,7 @@ diff --git a/addons/website_partner/__openerp__.py b/addons/website_partner/__openerp__.py index be318efa541..9373c015a11 100644 --- a/addons/website_partner/__openerp__.py +++ b/addons/website_partner/__openerp__.py @@ -32,6 +32,7 @@ 'views/website_partner_view.xml', 'security/website_partner_security.xml', ], + 'demo': ['website_partner_demo.xml'], 'css': [ ], 'js': [ diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/website_partner_demo.xml new file mode 100644 index 00000000000..95ad26c7313 --- /dev/null +++ b/addons/website_partner/website_partner_demo.xml @@ -0,0 +1,265 @@ + + + + + + True + + + + True + + + + True + + + + True + + + + True + + + + True + + + + True + + + + True + + + + True + + + + True + + + + En Nebulosa de negocios contamos con más de 20 años de trabajo en el campo de la “Ingeniería de Software”. A lo largo de este tiempo hemos atendido a una importante cantidad de clientes, pertenecientes a una diversa gama... + + +A lo largo de este tiempo hemos atendido a una importante cantidad de clientes, pertenecientes a una diversa gama de problemáticas.
+ +Con nuestra asistencia hemos cubierto las distintas fases que conforman un proyecto, con una metodología que ubica al Usuario como centro y actor privilegiado del proceso. +
+Esta trayectoria nos ubica en inmejorables condiciones para liderar proyectos de implementación, capacitación y customización de OpenERP.]]>
+
+ + + Agrolait est un prestataire spécialisé depuis 10 ans dans la mise en oeuvre de solutions open source ERP, BI et e-commerce. Agrolait compte 100 collaborateurs basés en France, Belgique, Luxembourg et Suisse. For... +
+ +Forts de 20 ans d’expérience dans les solutions ERP, nos consultants combinent expertise technologique, applicative et métier, afin de vous apporter un conseil éclairé tout au long de votre projet OpenERP.

+ +Notre méthodologie de projet, conçue pour les PME/PMI, est une garantie d'assurance qualité : architecture, installation, intégration, personnalisation, formation, suivi de projet, support, maintenance, et migration, notre engagement à vos côtés est total.

+ +Partenaire CTP Premium, Agrolait est certifié par OpenERP pour donner des formations fonctionnelles et techniques en France et en Tunisie.

+ +Nous intervenons sur plusieurs secteurs d'activité : distribution, retail, industrie, services, associations, avec une forte expertise sur le supply chain management (SCM) et les spécificités comptables pour le marché belge et français. Fort de son pôle d’expertise web, Agrolait vous fait aussi bénéficier des meilleurs conseils dans l’intégration d’OpenERP avec des portails.]]>
+
+ + + OpenCorp est une société de services IT spécialisée dans l’intégration de solutions opensource hébergées dans le cloud à destination des PME, TPE, startups et des professions libérales.Au vu des avancées technologiques... +
+ +Au vu des avancées technologiques qui ont modifié en profondeur les attentes des utilisateurs et des pressions toujours plus importantes sur les budgets, OpenCorp est conscient que le niveau d'exigence des clients n'a jamais été aussi élevé.

+ +Fort de plus de 20 années d’expérience dans les systèmes d'informations, les fondateurs d'OpenCorp se sont donnés comme mission de bousculer le marché en s'appuyant sur un catalogue de solutions efficaces, stables et abordables afin de permettre à ses clients de gagner en compétitivité.

+ +C'est dans cette optique qu'OpenCorp est aujourd'hui un des premier resellers de la solution OpenERP 7.0 en mode SaaS. Notre philosophie "back to the standards" permet de réduire significativement les coûts liés à l'implémentation des projets.

+ +Experts en business analysis, nos consultants vous accompagneront également dans l'analyse de vos besoins en documentant vos processus, en identifiant les possibilités d'amélioration et en préparant les mandats de vos projets.

+ +Avec OpenCorp, vous avez la garantie d’une mise en œuvre maîtrisée d’un point de vue opérationnel et budgétaire.]]>
+
+ + + 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 est une société de services spécialisée dans l'intégration d'ERP Open Source. Elle est notamment coéditrice de la version web de Open ERP et concentre toutes ses activités aux projets d'intégration de Open ERP... +
+La société possède son propre centre de R&D réalisant de nombreuses innovations permettant l'amélioration constante de Open ERP, telles que la nouvelle version web, les plug-In MS office et des connecteurs vers d'autres applications. Ses principaux atouts sont sa méthodologie d'intégration et sa rigueur permettant la prise en charge de grands projets depuis la phase d'audit et de conception jusqu'à la mise en production et l'accompagnement client.]]>
+
+ + + Créée en 2001, Camptocamp est Gold Partner OpenERP depuis 2006 en Suisse, France et Autriche et compte près de 50 collaborateurs tous professionnels de l'Open Source.Camptocamp est spécialisé dans l'imp... +
+Camptocamp est spécialisé dans l'implémentation d'OpenERP au sein de sociétés de 10 à plusieurs centaines de collaborateurs dans les secteurs suivants :
+
  • négoce (achat/vente/stock), en particulier le domaine du e-commerce ;
  • +
  • sociétés de services ;
  • +
  • organisations non gouvernementales (ONGs) humanitaires de rang international.
+Camptocamp a ainsi développé une forte expertise dans les domaines suivants : +
  • finance :
      +
    • localisation suisse, française et autrichienne ;
    • +
    • environnements multi-sociétés et multi-devises ;
    • +
    • rapports financiers (WebKit Reports) ;
    • +
    • automatisation bancaire : import de relevés bancaires, pré-remplissage des écritures comptables, lettrage de masse ;
  • +
  • logistique :
      +
    • automatisation avec des douchettes et code-barres : scénarios de scan pour les réceptions, expéditions, mouvements internes, inventaires, fabrications... ;
    • +
    • problématiques spécifiques multi-stocks, traçabilité et synchronisations offline ;
  • +
  • e-commerce :
      +
    • connecteur OpenERP Magento (bi-directionnel), permettant de synchroniser commandes, clients, produits, prix, méthodes de paiement et de livraison, expéditions... ;
    • +
    • connecteur OpenERP PrestaShop ;
  • +
  • développement et mise en place d'applications métier 100 % spécifiques tirant parti de la puissance du framework d'OpenERP (OpenObject).
+

+En outre, grâce à sa forte implication dans l'écosystème OpenERP depuis plusieurs années, Camptocamp a été promu par l’Éditeur OpenERP SA au statut de meilleur contributeur OpenERP en 2012 et 2013.
+Pour plus d'informations, visitez notre site web www.camptocamp.com et contactez les experts techniques et métiers de Camptocamp par email à business@camptocamp.com ! +

+Founded in 2001, Camptocamp has been an OpenERP Gold Partner in Switzerland, France and Austria since 2006. It has currently 50 employees with a wide range of skills in Open Source technologies. +
+Camptocamp is specialized in the implementation of OpenERP in SMEs, most particularly: +
    +
  • trade businesses (purchase/sale/stock), especially in the area of e-commerce;
  • +
  • service companies;
  • +
  • international humanitarian non governmental organizations (NGOs).
+
+Camptocamp has developed a strong expertize in the following fields: +
  • +finance: +
      +
    • +Swiss, French, and Austrian localization;
    • +
    • multi-company and multi-currency environments;
    • +
    • financial reports (WebKit Reports);
    • +
    • bank automation: import of bank statements, pre-entry of accounting entries, mass-lettering;
  • +
  • logistics:
      +
    • automation with scanners and code-bars: scenarios of scans for receipt, shipping, internal moves, inventories, manufacturing, etc.;
    • +
    • specific multi-stock, traceability, and offline synchronizations solutions;
  • +
  • e-commerce :
      +
    • OpenERP Magento connector (bi-directional), allowing the synchronization of orders, clients, products, prices, payment methods, delivery methods, shipping, etc.;
    • +
    • OpenERP PrestaShop connector;
  • +
  • development and implementation of 100%-specific business applications thanks to the powerful OpenERP framework (OpenObject).
+

+In 2012 and 2013, Camptocamp was selected by the Editor, OpenERP SA, as the Best OpenERP contributor, thanks to its dedicated involvement in the OpenERP ecosystem since becoming a partner.
+For more information, please visit our website www.camptocamp.com and contact our experts by email at business@camptocamp.com! ]]>
+
+ + + 3 gute Gründe, sich heute noch für Federal als Partner für die Implementierung Ihres ERP Projekts zu entscheiden: Sie haben erstens einen Software-Spezialisten, zweitens einen Hardware- und Performance-Fachmann UND drittens einen Betriebswirt mit Know-how im Projektmanagement. Und... + +Sie haben erstens einen Software-Spezialisten, zweitens einen Hardware- und Performance-Fachmann UND drittens einen Betriebswirt mit Know-how im Projektmanagement. Und was bedeutet das für Sie? Ganz einfach…
+… Ihre ganz individuellen Anforderungen werden in der Standardsoftware abgebildet
+… professionelle Konzeption des optimalen Sizings für Ihre Systemlandschaft
+… Verständnis für kaufmännische und logistische Prozesse in Ihrem Unternehmen sowie Einbindung Ihrer Mitarbeiter und effizienter Einsatz von Ressourcen.

+Vor allem brauchen Sie einen zuverlässigen und professionellen Berater/Begleiter, der Ihnen zuhört, Ihre Herausforderungen ernst nimmt und sie in Ihrem Sinne umsetzt. Und das unter Einhaltung von Zeit- und Budgetvorgaben ohne Ihnen ein X für ein U vorzumachen. Willkommen bei Federal ]]>
+
+ + + Wir bieten Implementierung, Anpassung und Schulung für OpenERP. Schon seit TinyERP 4 entwickeln wir auch kundenspezifische Module. Neben individuellen Lösungen gibt es bereits vorkonfigurierte Systeme für: - ... + +- Lebensmittelproduktion (z.B.: Frucht- und Gemüse)
+- Serviceanbieter mit Projektmanagement
+- Maschinenbau und Gerätehersteller]]>
+
+ + + Luminous es una empresa tecnológica, dinámica, innovadora y ágil que desarrolla soluciones de Gestión Empresarial a través de su sistema propio de Inteligencia Artificial “NEUROVIP” NEUROVIP es un sistema que convie... + Luminous es una empresa tecnológica, dinámica, innovadora y ágil que desarrolla soluciones de Gestión Empresarial a través de su sistema propio de Inteligencia Artificial “NEUROVIP”.



NEUROVIP es un sistema que convierte los datos provenientes de las herramientas de Gestión Empresarial (ERP´s, CRM´s, DMS´s, BPM´s, etc.) en información relevante para la Toma de Decisiones Estratégicas de la Empresa.

+ +Luminous con su sistema propio de Inteligencia Artificial “NEUROVIP” se dirige a todo tipo de organización, ya sea del sector público o privado. +

+Su utilidad radica en que se tomen decisiones estratégicas de forma oportuna y de manera eficiente para conseguir competitividad en las empresas frente a la globalización y su entorno. +

+NEUROVIP consta de tres fases:
+1ª Fase: En la primera fase Analiza los datos definidos por el usuario.
+2ª Fase: En la segunda fase Aprende alimentándose con información social y/o empresarial.
+3ª Fase: En la tercera fase Recomienda priorizando intereses concretos de la empresa.

]]>
+
+ + + 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... + 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 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.]]>
    +
    + + + 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 ... + 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. To know more please visit our site and subscribe at www.bestdesigners.com +]]>
    +
    + + From e6975af943b41e5933523688984d4e354c98633d Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 17 Oct 2013 19:06:45 +0530 Subject: [PATCH 04/55] [IMP]Put if condition. bzr revid: bth@tinyerp.com-20131017133645-b6w5xa6r6no3tm93 --- addons/website_customer/views/website_customer.xml | 2 +- addons/website_membership/views/website_membership.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index 7109dc4d29c..191519c82d6 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -68,7 +68,7 @@ diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml index ec99b5d03d4..e99cef651f6 100644 --- a/addons/website_membership/views/website_membership.xml +++ b/addons/website_membership/views/website_membership.xml @@ -73,7 +73,7 @@
    -
    +
    From 831ee92bbae6bd7352354fe49ac510b38b70a91d Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 17 Oct 2013 19:21:15 +0530 Subject: [PATCH 05/55] [IMP]If condition for active class. bzr revid: bth@tinyerp.com-20131017135115-una5ak65hz1pnt0b --- addons/website_membership/views/website_membership.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml index e99cef651f6..79b7fa224ec 100644 --- a/addons/website_membership/views/website_membership.xml +++ b/addons/website_membership/views/website_membership.xml @@ -35,7 +35,7 @@
  • développement et mise en place d'applications métier 100 % spécifiques tirant parti de la puissance du framework d'OpenERP (OpenObject).
-

-En outre, grâce à sa forte implication dans l'écosystème OpenERP depuis plusieurs années, Camptocamp a été promu par l’Éditeur OpenERP SA au statut de meilleur contributeur OpenERP en 2012 et 2013.
-Pour plus d'informations, visitez notre site web www.camptocamp.com et contactez les experts techniques et métiers de Camptocamp par email à business@camptocamp.com ! -

-Founded in 2001, Camptocamp has been an OpenERP Gold Partner in Switzerland, France and Austria since 2006. It has currently 50 employees with a wide range of skills in Open Source technologies.
-Camptocamp is specialized in the implementation of OpenERP in SMEs, most particularly: -
    -
  • trade businesses (purchase/sale/stock), especially in the area of e-commerce;
  • -
  • service companies;
  • -
  • international humanitarian non governmental organizations (NGOs).
-
-Camptocamp has developed a strong expertize in the following fields: -
  • -finance: -
      -
    • -Swiss, French, and Austrian localization;
    • -
    • multi-company and multi-currency environments;
    • -
    • financial reports (WebKit Reports);
    • -
    • bank automation: import of bank statements, pre-entry of accounting entries, mass-lettering;
  • -
  • logistics:
      -
    • automation with scanners and code-bars: scenarios of scans for receipt, shipping, internal moves, inventories, manufacturing, etc.;
    • -
    • specific multi-stock, traceability, and offline synchronizations solutions;
  • -
  • e-commerce :
      -
    • OpenERP Magento connector (bi-directional), allowing the synchronization of orders, clients, products, prices, payment methods, delivery methods, shipping, etc.;
    • -
    • OpenERP PrestaShop connector;
  • -
  • development and implementation of 100%-specific business applications thanks to the powerful OpenERP framework (OpenObject).
-

-In 2012 and 2013, Camptocamp was selected by the Editor, OpenERP SA, as the Best OpenERP contributor, thanks to its dedicated involvement in the OpenERP ecosystem since becoming a partner.
-For more information, please visit our website www.camptocamp.com and contact our experts by email at business@camptocamp.com! ]]>
+En outre, grâce à sa forte implication dans l'écosystème OpenERP depuis plusieurs années, Camptocamp a été promu par l’Éditeur OpenERP SA au statut de meilleur contributeur OpenERP en 2012 et 2013.
+Pour plus d'informations, visitez notre site web www.camptocamp.com et contactez les experts techniques et métiers de Camptocamp par email à business@camptocamp.com ! ]]>
From 64a7c35bb96b8325461169fbd5bc38a8510aace2 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 21 Oct 2013 18:15:40 +0530 Subject: [PATCH 12/55] [IMP]Improved address. bzr revid: bth@tinyerp.com-20131021124540-5kn3mvug0anf0897 --- addons/website_partner/website_partner_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/website_partner_demo.xml index ac972704a28..809ebdae8c1 100644 --- a/addons/website_partner/website_partner_demo.xml +++ b/addons/website_partner/website_partner_demo.xml @@ -225,8 +225,8 @@ At Think Big Systems we bring operational experience combined with technological - Best Designers is an IT services organization, established by 3 industry experts headquartered at Coimbatore, Tamil Nadu, 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. + 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.

From c8d1d72a0b927047b3bc83b302c58051b087c13b Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 23 Oct 2013 18:23:40 +0530 Subject: [PATCH 13/55] [IMP]Added yml file for invoiced status of membership. bzr revid: bth@tinyerp.com-20131023125340-xo6fu8loygwjo355 --- addons/membership/__openerp__.py | 4 +++- addons/membership/membership_demo.yml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 addons/membership/membership_demo.yml diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py index 4a0a80694b3..46e5e423e18 100644 --- a/addons/membership/__openerp__.py +++ b/addons/membership/__openerp__.py @@ -47,7 +47,9 @@ invoice and send propositions for membership renewal. 'report/report_membership_view.xml', 'process/membership_process.xml', ], - 'demo': ['membership_demo.xml'], + 'demo': ['membership_demo.xml', + 'membership_demo.yml' + ], 'test': ['test/test_membership.yml'], 'installable': True, 'auto_install': False, diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml new file mode 100644 index 00000000000..e22b71ff7dc --- /dev/null +++ b/addons/membership/membership_demo.yml @@ -0,0 +1,5 @@ +- + !python {model: res.partner}: | + invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_2"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5")], product_id=ref("membership_1"), datas={"amount":80.00}) + invoice_pool = self.pool.get('account.invoice') + invoice_pool.signal_invoice_open(cr, uid, invoice_ids) From 17a37e775d4dcf7312ec6792c0f16adcc4cba5e0 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 23 Oct 2013 19:22:41 +0530 Subject: [PATCH 14/55] [IMP]Created for invoiced and waiting state membership. bzr revid: bth@tinyerp.com-20131023135241-zphclcokpyj0jc75 --- addons/membership/membership_demo.xml | 12 ++++++++++-- addons/membership/membership_demo.yml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index fd7d3f29afb..2a165ab308f 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -56,12 +56,20 @@
- + - + + + + + + + + +
diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml index e22b71ff7dc..7b4dfc741ed 100644 --- a/addons/membership/membership_demo.yml +++ b/addons/membership/membership_demo.yml @@ -1,5 +1,5 @@ - !python {model: res.partner}: | - invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_2"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5")], product_id=ref("membership_1"), datas={"amount":80.00}) + invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5")], product_id=ref("membership_1"), datas={"amount":80.00}) invoice_pool = self.pool.get('account.invoice') invoice_pool.signal_invoice_open(cr, uid, invoice_ids) From 3a2a98034ebb0a5d437b309056cacf31e4fc68a4 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 24 Oct 2013 17:48:49 +0530 Subject: [PATCH 15/55] [IMP]Improved code to paid invoiced. bzr revid: bth@tinyerp.com-20131024121849-0sgdrta07u3quxr6 --- addons/membership/membership_demo.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml index 7b4dfc741ed..d4586b6c805 100644 --- a/addons/membership/membership_demo.yml +++ b/addons/membership/membership_demo.yml @@ -1,5 +1,18 @@ +- + create invoice and state is 'open' and pay some invoice - !python {model: res.partner}: | - invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5")], product_id=ref("membership_1"), datas={"amount":80.00}) + invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5"),ref("base.res_partner_21"),ref("base.res_partner_25"),ref("base.res_partner_6"),ref("base.res_partner_16"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00}) invoice_pool = self.pool.get('account.invoice') invoice_pool.signal_invoice_open(cr, uid, invoice_ids) + paidinvoiceids = [] + i = 0 + for id in invoice_ids: + if i > 6: + pay = invoice_pool.pay_and_reconcile(cr, uid, [id], + 9050.0, ref('account.cash'), ref('account.period_10'), + ref('account.bank_journal'), ref('account.cash'), + ref('account.period_10'), ref('account.bank_journal'), + name='Payment for test customer invoice') + assert (pay == True), "Incorrect Payment" + i = i + 1 From 1a2c57343f62e16538f56ac6a54829d6e37e6198 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Fri, 25 Oct 2013 12:01:02 +0530 Subject: [PATCH 16/55] [IMP]Removed partner. bzr revid: bth@tinyerp.com-20131025063102-69mdt50mja6ydsy2 --- addons/membership/membership_demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml index d4586b6c805..3271de2f273 100644 --- a/addons/membership/membership_demo.yml +++ b/addons/membership/membership_demo.yml @@ -2,7 +2,7 @@ create invoice and state is 'open' and pay some invoice - !python {model: res.partner}: | - invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5"),ref("base.res_partner_21"),ref("base.res_partner_25"),ref("base.res_partner_6"),ref("base.res_partner_16"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00}) + invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5"),ref("base.res_partner_21"),ref("base.res_partner_6"),ref("base.res_partner_16"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00}) invoice_pool = self.pool.get('account.invoice') invoice_pool.signal_invoice_open(cr, uid, invoice_ids) paidinvoiceids = [] From 93bcef7229d0f6044bc460dfccb872cec6c710b4 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 28 Oct 2013 13:09:42 +0530 Subject: [PATCH 17/55] [IMP]Remove assigned partners in demo. bzr revid: bth@tinyerp.com-20131028073942-gqtybkjuvpbunxqm --- .../crm_partner_assign/res_partner_demo.xml | 21 +++++++++---------- addons/membership/membership_demo.yml | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index cb923efbf98..4ca0e6335a9 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -22,7 +22,12 @@ 10
- + + + + + + 10 @@ -48,10 +53,7 @@ 10 - - - 10 - + 10 @@ -60,7 +62,7 @@ 10 - + 10 @@ -73,10 +75,7 @@ 10 - - - - + diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml index 3271de2f273..a1f4c37e4ab 100644 --- a/addons/membership/membership_demo.yml +++ b/addons/membership/membership_demo.yml @@ -5,7 +5,7 @@ invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_14"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_8"),ref("base.res_partner_5"),ref("base.res_partner_21"),ref("base.res_partner_6"),ref("base.res_partner_16"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00}) invoice_pool = self.pool.get('account.invoice') invoice_pool.signal_invoice_open(cr, uid, invoice_ids) - paidinvoiceids = [] + i = 0 for id in invoice_ids: if i > 6: From a6cc45e3854c002ac21e89a9f094ebac6787b54a Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 28 Oct 2013 14:14:47 +0530 Subject: [PATCH 18/55] [IMP]Comment on assigned grade. bzr revid: bth@tinyerp.com-20131028084447-q8b09q25phs12xwy --- addons/crm_partner_assign/res_partner_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 4ca0e6335a9..0fa339a30be 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -26,7 +26,7 @@ - + From aef82f165246a1170dc9fdd967f2d740c7e625ff Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 10:53:42 +0530 Subject: [PATCH 23/55] [IMP]Removed assigned grades. bzr revid: bth@tinyerp.com-20131029052342-vwcrusqhqwb87131 --- .../crm_partner_assign/res_partner_demo.xml | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 619658e1bdb..e882c6849fc 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -37,32 +37,5 @@ 10 - - - 10 - - - - 10 - - - - 10 - - - - - 10 - - - - - 10 - - - - 10 - - From 90024802ce08936d15fedbdeaedf407865eed010 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 11:39:51 +0530 Subject: [PATCH 24/55] [IMP]Assigned grades to partners. bzr revid: bth@tinyerp.com-20131029060951-kn9eqs17td3bkp17 --- .../crm_partner_assign/res_partner_demo.xml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index e882c6849fc..619658e1bdb 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -37,5 +37,32 @@ 10 + + + 10 + + + + 10 + + + + 10 + + + + + 10 + + + + + 10 + + + + 10 + + From cb3198370df62089b1197c79720f121ea49018e2 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 12:09:35 +0530 Subject: [PATCH 25/55] [IMP]Removed some grades. bzr revid: bth@tinyerp.com-20131029063935-tq7xf7v7t5wl03li --- addons/crm_partner_assign/res_partner_demo.xml | 14 -------------- addons/website_partner/website_partner_demo.xml | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 619658e1bdb..9852daeea3f 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -50,19 +50,5 @@ 10 - - - 10 - - - - - 10 - - - - 10 - - diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/website_partner_demo.xml index 809ebdae8c1..dd6a3d843fe 100644 --- a/addons/website_partner/website_partner_demo.xml +++ b/addons/website_partner/website_partner_demo.xml @@ -131,7 +131,7 @@ Camptocamp a ainsi développé une forte expertise dans les domaines suivants :
  • développement et mise en place d'applications métier 100 % spécifiques tirant parti de la puissance du framework d'OpenERP (OpenObject).

  • En outre, grâce à sa forte implication dans l'écosystème OpenERP depuis plusieurs années, Camptocamp a été promu par l’Éditeur OpenERP SA au statut de meilleur contributeur OpenERP en 2012 et 2013.
    -Pour plus d'informations, visitez notre site web www.camptocamp.com et contactez les experts techniques et métiers de Camptocamp par email à business@camptocamp.com ! ]]> +]]> @@ -230,7 +230,7 @@ At Think Big Systems we bring operational experience combined with technological

    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. To know more please visit our site and subscribe at www.bestdesigners.com +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. ]]>
    From 7604f13b4604ab1e60897c89269dad563d7a9fe1 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 12:38:49 +0530 Subject: [PATCH 26/55] [IMP]Removed grades. bzr revid: bth@tinyerp.com-20131029070849-49daiij4jtv5yey2 --- addons/crm_partner_assign/res_partner_demo.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 9852daeea3f..e882c6849fc 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -37,18 +37,5 @@ 10 - - - 10 - - - - 10 - - - - 10 - - From 4542ea969c57d053e9009da43eb4fb91f5dc68df Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 17:51:48 +0530 Subject: [PATCH 27/55] [IMP]Assigned grades to partners. bzr revid: bth@tinyerp.com-20131029122148-d6groc4h4q6axv4q --- addons/crm_partner_assign/res_partner_demo.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index e882c6849fc..8c5188057b6 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -27,15 +27,19 @@ - + 10 - + 10 + + + 10 + From d33a379c6e857e7adbc9d11a6527aa7089b55ded Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 18:17:12 +0530 Subject: [PATCH 28/55] [IMP]Assigned grades to partners. bzr revid: bth@tinyerp.com-20131029124712-ewjkb14mearvs128 --- .../crm_partner_assign/res_partner_demo.xml | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 8c5188057b6..422fffc0a37 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -22,16 +22,13 @@ 10 - - 10 - 10 @@ -41,5 +38,26 @@ 10 + + + 10 + + + + 10 + + + + + 10 + + + + 10 + + + + 10 + From 19d139fa60e6264c7f7663b63a26ea7035b15d3d Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 29 Oct 2013 18:46:10 +0530 Subject: [PATCH 29/55] [IMP]Assigned grade to partners. bzr revid: bth@tinyerp.com-20131029131610-c6t88e101326dnw0 --- addons/crm_partner_assign/res_partner_demo.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 422fffc0a37..adfbc103bc5 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -59,5 +59,14 @@ 10 + + + + 10 + + + + 10 + From 736c57d8f83be4f6281e5921bc229d70c8dd9acb Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 30 Oct 2013 13:01:05 +0530 Subject: [PATCH 30/55] [IMP]Add css and dependency to fix error. bzr revid: bth@tinyerp.com-20131030073105-99f5dsh0qh2w2baa --- addons/website/static/src/css/website.css | 4 ++++ addons/website/static/src/css/website.sass | 9 ++++++--- addons/website_crm_partner_assign/__openerp__.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 93ede5035ae..866d35e8d81 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -448,3 +448,7 @@ table.well tr th { text-align: right; padding-right: 10px; } + +table.well tr td span { + padding-right: 5px; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index d5e991bfe2d..752d32cc9ec 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -339,6 +339,9 @@ a[data-publish] .texttop vertical-align: top -table.well tr th - text-align: right - padding-right: 10px +table.well tr + th + text-align: right + padding-right: 10px + td + padding-right: 5px diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py index 75a3aa39776..a1c352385c2 100644 --- a/addons/website_crm_partner_assign/__openerp__.py +++ b/addons/website_crm_partner_assign/__openerp__.py @@ -8,7 +8,7 @@ Publish and Assign Partner ========================== """, 'author': 'OpenERP SA', - 'depends': ['website_partner', 'website_google_map'], + 'depends': ['crm_partner_assign','website_partner', 'website_google_map'], 'data': [ 'views/website_crm_partner_assign.xml', ], From 42f82545df4f69b3bc68579dd283263774f63830 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 30 Oct 2013 15:00:59 +0530 Subject: [PATCH 31/55] [IMP]Assigned partner. bzr revid: bth@tinyerp.com-20131030093059-dzau0um4oreq3iva --- addons/crm_partner_assign/res_partner_demo.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index adfbc103bc5..15880b9c118 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -68,5 +68,9 @@ 10 + + + + From a14aeba0f6d6858b1046f3d9aa2d7c3b02c2c77e Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 30 Oct 2013 15:09:00 +0530 Subject: [PATCH 32/55] [IMP]Add assigned partners. bzr revid: bth@tinyerp.com-20131030093900-skhbt93b5i0rglc3 --- addons/crm_partner_assign/res_partner_demo.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 15880b9c118..0f042a675ac 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -72,5 +72,11 @@ + + + + + + From c749dbf1dc95f052504960e2164d30532699047a Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 30 Oct 2013 16:30:19 +0530 Subject: [PATCH 33/55] [IMP]Add email. bzr revid: bth@tinyerp.com-20131030110019-a2d1it6rtn42ya95 --- addons/l10n_uk/demo/demo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml index ec262412c43..8db565f990e 100644 --- a/addons/l10n_uk/demo/demo.xml +++ b/addons/l10n_uk/demo/demo.xml @@ -10,6 +10,7 @@ +44 845 643 4548 08455274653 http://www.smartmode.co.uk + smartmode@yourcompany.example.com From 4a68d69b76810045395b9ee91b1572e4cacababa Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 31 Oct 2013 14:39:50 +0530 Subject: [PATCH 34/55] [IMP]Added free members. bzr revid: bth@tinyerp.com-20131031090950-idob74nqsyfaabn0 --- addons/membership/membership_demo.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index 2a165ab308f..c384e62a9b1 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -54,6 +54,12 @@ True + + True + + + True + From 7af88b47f9c61f59c1fee261851097670ce0c6b5 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 31 Oct 2013 15:11:07 +0530 Subject: [PATCH 35/55] [IMP]Add free member. bzr revid: bth@tinyerp.com-20131031094107-74lqrq6bd2e5gmsi --- addons/membership/membership_demo.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index c384e62a9b1..7775050fb9e 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -60,6 +60,9 @@ True + + True + From 855e928f83d240ba5a7ff3e6c1b9b36c93584021 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 31 Oct 2013 16:17:19 +0530 Subject: [PATCH 36/55] [IMP]Improved code. bzr revid: bth@tinyerp.com-20131031104719-q4ipxnq57jyj1wke --- addons/membership/membership_demo.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml index a1f4c37e4ab..e21d70f0fd5 100644 --- a/addons/membership/membership_demo.yml +++ b/addons/membership/membership_demo.yml @@ -6,13 +6,10 @@ invoice_pool = self.pool.get('account.invoice') invoice_pool.signal_invoice_open(cr, uid, invoice_ids) - i = 0 - for id in invoice_ids: - if i > 6: - pay = invoice_pool.pay_and_reconcile(cr, uid, [id], - 9050.0, ref('account.cash'), ref('account.period_10'), - ref('account.bank_journal'), ref('account.cash'), - ref('account.period_10'), ref('account.bank_journal'), - name='Payment for test customer invoice') - assert (pay == True), "Incorrect Payment" - i = i + 1 + for id in invoice_ids[-4:]: + pay = invoice_pool.pay_and_reconcile(cr, uid, [id], + 9050.0, ref('account.cash'), ref('account.period_10'), + ref('account.bank_journal'), ref('account.cash'), + ref('account.period_10'), ref('account.bank_journal'), + name='Payment for test customer invoice') + assert (pay == True), "Incorrect Payment" From 596da49accdac37f9cbd32a15233decb9eab7050 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Fri, 8 Nov 2013 19:08:01 +0530 Subject: [PATCH 37/55] [IMP]Improved demo data for company. bzr revid: bth@tinyerp.com-20131108133801-64wluz06og52mad3 --- addons/multi_company/multi_company_demo.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index c772a8fd67d..a8c1a0f3840 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -24,24 +24,28 @@ OpenERP Editor + OpenERP US + OpenERP BE + OpenERP IN + From b83e196b9c268250c4fb291fef114cc03dd6142c Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Mon, 11 Nov 2013 17:58:12 +0530 Subject: [PATCH 38/55] [IMP]Set email address. bzr revid: bth@tinyerp.com-20131111122812-3j7zsghk2ohpj720 --- addons/portal/portal_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml index 81118b52c73..7e48b7918f2 100644 --- a/addons/portal/portal_demo.xml +++ b/addons/portal/portal_demo.xml @@ -5,7 +5,7 @@ Demo Portal User - demo@portal.example.com + demo.portal@yourcompany.example.com none From 6a08b02ca27b7a0184c9975fbac19d78ea88cef8 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 12 Nov 2013 11:19:50 +0530 Subject: [PATCH 39/55] [IMP]Order added in search. bzr revid: bth@tinyerp.com-20131112054950-669aq2ndlhzvpnmx --- addons/website_membership/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py index 795a38dc954..4d1a52f5451 100644 --- a/addons/website_membership/controllers/main.py +++ b/addons/website_membership/controllers/main.py @@ -55,7 +55,7 @@ class WebsiteMembership(http.Controller): if post_country_id: line_domain += [('partner.country_id', '=', post_country_id)] - membership_line_ids = membership_line_obj.search(cr, uid, line_domain, context=context) + membership_line_ids = membership_line_obj.search(cr, uid, line_domain, order='membership_id', context=context) membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context) partner_ids = [m.partner and m.partner.id for m in membership_lines] google_map_partner_ids = ",".join([str(pid) for pid in partner_ids]) From a1735fa9b22bd99be64abd36d6f0076e31fa9c5a Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 12 Nov 2013 13:07:32 +0530 Subject: [PATCH 40/55] [IMP]Added referenced to published partners. bzr revid: bth@tinyerp.com-20131112073732-ru5t07ekemyvhmzx --- addons/crm_partner_assign/res_partner_demo.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 0f042a675ac..8e9ac365b41 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -78,5 +78,14 @@ + + + + + + + + + From 4ee6188d69e6b91140c3ce8053afceb3e0daf0f9 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 12 Nov 2013 14:24:59 +0530 Subject: [PATCH 41/55] [IMP]Added referenced to published partners. bzr revid: bth@tinyerp.com-20131112085459-bqgt8m7fgrboh9qx --- addons/crm_partner_assign/res_partner_demo.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml index 8e9ac365b41..776d7d6834c 100644 --- a/addons/crm_partner_assign/res_partner_demo.xml +++ b/addons/crm_partner_assign/res_partner_demo.xml @@ -87,5 +87,23 @@ + + + + + + + + + + + + + + + + + + From f91299755b5783a558aced8103366449b9888e22 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 12 Nov 2013 15:28:14 +0530 Subject: [PATCH 42/55] [IMP]Partners' descriptions are in english. bzr revid: bth@tinyerp.com-20131112095814-b7geeaxr7gb85atn --- .../website_partner/website_partner_demo.xml | 117 +++++++++--------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/website_partner_demo.xml index dd6a3d843fe..bedd472cc2a 100644 --- a/addons/website_partner/website_partner_demo.xml +++ b/addons/website_partner/website_partner_demo.xml @@ -43,42 +43,42 @@ - En Nebulosa de negocios contamos con más de 20 años de trabajo en el campo de la “Ingeniería de Software”. A lo largo de este tiempo hemos atendido a una importante cantidad de clientes, pertenecientes a una diversa gama... - + 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... + -A lo largo de este tiempo hemos atendido a una importante cantidad de clientes, pertenecientes a una diversa gama de problemáticas.
    +Throughout this time we have served a large number of clients belonging to a diverse range of issues.
    -Con nuestra asistencia hemos cubierto las distintas fases que conforman un proyecto, con una metodología que ubica al Usuario como centro y actor privilegiado del proceso. +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.
    -Esta trayectoria nos ubica en inmejorables condiciones para liderar proyectos de implementación, capacitación y customización de OpenERP.]]>
    +This path puts us uniquely equipped to lead projects implementation, training and customization of OpenERP.]]>
    - Agrolait est un prestataire spécialisé depuis 10 ans dans la mise en oeuvre de solutions open source ERP, BI et e-commerce. Agrolait compte 100 collaborateurs basés en France, Belgique, Luxembourg et Suisse. For... -
    + 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... +
    -Forts de 20 ans d’expérience dans les solutions ERP, nos consultants combinent expertise technologique, applicative et métier, afin de vous apporter un conseil éclairé tout au long de votre projet OpenERP.

    +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.

    -Notre méthodologie de projet, conçue pour les PME/PMI, est une garantie d'assurance qualité : architecture, installation, intégration, personnalisation, formation, suivi de projet, support, maintenance, et migration, notre engagement à vos côtés est total.

    +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.

    -Partenaire CTP Premium, Agrolait est certifié par OpenERP pour donner des formations fonctionnelles et techniques en France et en Tunisie.

    +Premium Partner PTC Agrolait is certified by OpenERP to provide functional and technical training in France and Tunisia.

    -Nous intervenons sur plusieurs secteurs d'activité : distribution, retail, industrie, services, associations, avec une forte expertise sur le supply chain management (SCM) et les spécificités comptables pour le marché belge et français. Fort de son pôle d’expertise web, Agrolait vous fait aussi bénéficier des meilleurs conseils dans l’intégration d’OpenERP avec des portails.]]>
    +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 est une société de services IT spécialisée dans l’intégration de solutions opensource hébergées dans le cloud à destination des PME, TPE, startups et des professions libérales.Au vu des avancées technologiques... -
    + 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... +
    -Au vu des avancées technologiques qui ont modifié en profondeur les attentes des utilisateurs et des pressions toujours plus importantes sur les budgets, OpenCorp est conscient que le niveau d'exigence des clients n'a jamais été aussi élevé.

    +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.

    -Fort de plus de 20 années d’expérience dans les systèmes d'informations, les fondateurs d'OpenCorp se sont donnés comme mission de bousculer le marché en s'appuyant sur un catalogue de solutions efficaces, stables et abordables afin de permettre à ses clients de gagner en compétitivité.

    +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.

    -C'est dans cette optique qu'OpenCorp est aujourd'hui un des premier resellers de la solution OpenERP 7.0 en mode SaaS. Notre philosophie "back to the standards" permet de réduire significativement les coûts liés à l'implémentation des projets.

    +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 en business analysis, nos consultants vous accompagneront également dans l'analyse de vos besoins en documentant vos processus, en identifiant les possibilités d'amélioration et en préparant les mandats de vos projets.

    +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.

    -Avec OpenCorp, vous avez la garantie d’une mise en œuvre maîtrisée d’un point de vue opérationnel et budgétaire.]]>
    +With OpenCorp, you are guaranteed a controlled implementation of an operational and budgetary standpoint.]]>
    @@ -103,67 +103,66 @@ e. Human resources: recruitment, payroll management.]]>
    - Axelor est une société de services spécialisée dans l'intégration d'ERP Open Source. Elle est notamment coéditrice de la version web de Open ERP et concentre toutes ses activités aux projets d'intégration de Open ERP... -
    -La société possède son propre centre de R&D réalisant de nombreuses innovations permettant l'amélioration constante de Open ERP, telles que la nouvelle version web, les plug-In MS office et des connecteurs vers d'autres applications. Ses principaux atouts sont sa méthodologie d'intégration et sa rigueur permettant la prise en charge de grands projets depuis la phase d'audit et de conception jusqu'à la mise en production et l'accompagnement client.]]>
    + 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.]]>
    - Créée en 2001, Camptocamp est Gold Partner OpenERP depuis 2006 en Suisse, France et Autriche et compte près de 50 collaborateurs tous professionnels de l'Open Source.Camptocamp est spécialisé dans l'imp... -
    -Camptocamp est spécialisé dans l'implémentation d'OpenERP au sein de sociétés de 10 à plusieurs centaines de collaborateurs dans les secteurs suivants :
    -
    • négoce (achat/vente/stock), en particulier le domaine du e-commerce ;
    • -
    • sociétés de services ;
    • -
    • organisations non gouvernementales (ONGs) humanitaires de rang international.
    -Camptocamp a ainsi développé une forte expertise dans les domaines suivants : + 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 :
        -
      • localisation suisse, française et autrichienne ;
      • -
      • environnements multi-sociétés et multi-devises ;
      • +
      • Swiss localization, French and Austrian;
      • +
      • multi-company and multi-currency environments;
      • rapports financiers (WebKit Reports) ;
      • -
      • automatisation bancaire : import de relevés bancaires, pré-remplissage des écritures comptables, lettrage de masse ;
    • -
    • logistique :
        -
      • automatisation avec des douchettes et code-barres : scénarios de scan pour les réceptions, expéditions, mouvements internes, inventaires, fabrications... ;
      • -
      • problématiques spécifiques multi-stocks, traçabilité et synchronisations offline ;
    • +
    • 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 :
      -
    • connecteur OpenERP Magento (bi-directionnel), permettant de synchroniser commandes, clients, produits, prix, méthodes de paiement et de livraison, expéditions... ;
    • -
    • connecteur OpenERP PrestaShop ;
  • -
  • développement et mise en place d'applications métier 100 % spécifiques tirant parti de la puissance du framework d'OpenERP (OpenObject).
  • +
  • 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).

  • -En outre, grâce à sa forte implication dans l'écosystème OpenERP depuis plusieurs années, Camptocamp a été promu par l’Éditeur OpenERP SA au statut de meilleur contributeur OpenERP en 2012 et 2013.
    +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 gute Gründe, sich heute noch für Federal als Partner für die Implementierung Ihres ERP Projekts zu entscheiden: Sie haben erstens einen Software-Spezialisten, zweitens einen Hardware- und Performance-Fachmann UND drittens einen Betriebswirt mit Know-how im Projektmanagement. Und... - -Sie haben erstens einen Software-Spezialisten, zweitens einen Hardware- und Performance-Fachmann UND drittens einen Betriebswirt mit Know-how im Projektmanagement. Und was bedeutet das für Sie? Ganz einfach…
    -… Ihre ganz individuellen Anforderungen werden in der Standardsoftware abgebildet
    -… professionelle Konzeption des optimalen Sizings für Ihre Systemlandschaft
    -… Verständnis für kaufmännische und logistische Prozesse in Ihrem Unternehmen sowie Einbindung Ihrer Mitarbeiter und effizienter Einsatz von Ressourcen.

    -Vor allem brauchen Sie einen zuverlässigen und professionellen Berater/Begleiter, der Ihnen zuhört, Ihre Herausforderungen ernst nimmt und sie in Ihrem Sinne umsetzt. Und das unter Einhaltung von Zeit- und Budgetvorgaben ohne Ihnen ein X für ein U vorzumachen. Willkommen bei Federal ]]>
    + 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 ]]>
    - Wir bieten Implementierung, Anpassung und Schulung für OpenERP. Schon seit TinyERP 4 entwickeln wir auch kundenspezifische Module. Neben individuellen Lösungen gibt es bereits vorkonfigurierte Systeme für: - ... - -- Lebensmittelproduktion (z.B.: Frucht- und Gemüse)
    -- Serviceanbieter mit Projektmanagement
    -- Maschinenbau und Gerätehersteller]]>
    + 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 es una empresa tecnológica, dinámica, innovadora y ágil que desarrolla soluciones de Gestión Empresarial a través de su sistema propio de Inteligencia Artificial “NEUROVIP” NEUROVIP es un sistema que convie... - Luminous es una empresa tecnológica, dinámica, innovadora y ágil que desarrolla soluciones de Gestión Empresarial a través de su sistema propio de Inteligencia Artificial “NEUROVIP”.

    

NEUROVIP es un sistema que convierte los datos provenientes de las herramientas de Gestión Empresarial (ERP´s, CRM´s, DMS´s, BPM´s, etc.) en información relevante para la Toma de Decisiones Estratégicas de la Empresa.

    + 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 con su sistema propio de Inteligencia Artificial “NEUROVIP” se dirige a todo tipo de organización, ya sea del sector público o privado. +Luminous with its own artificial intelligence system "NEUROVIP" addresses all types of organizations, whether public or private sector.

    -Su utilidad radica en que se tomen decisiones estratégicas de forma oportuna y de manera eficiente para conseguir competitividad en las empresas frente a la globalización y su entorno. +Its usefulness is that strategic decisions in a timely and efficient manner to achieve business competitiveness to globalization and its environment.

    -NEUROVIP consta de tres fases:
    -1ª Fase: En la primera fase Analiza los datos definidos por el usuario.
    -2ª Fase: En la segunda fase Aprende alimentándose con información social y/o empresarial.
    -3ª Fase: En la tercera fase Recomienda priorizando intereses concretos de la empresa.

    ]]>
    +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.

    ]]>
    From d47f7aa76afcb00e2d5f8d6a1e4c01130dfdb402 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 12 Nov 2013 19:09:24 +0530 Subject: [PATCH 43/55] [IMP]Removed shop. bzr revid: bth@tinyerp.com-20131112133924-j5z44kpr4n58h182 --- addons/stock/stock_demo.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index eb5a6c46380..d4e0f68cc78 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -180,7 +180,7 @@ - Your Company, Chicago shop + Your Company, Chicago 1 @@ -205,7 +205,7 @@ - Your Company, Chicago shop + Your Company @@ -245,7 +245,7 @@ internal none - Your Company, Chicago shop + Your Company, Chicago manual From 0e7b2ae4532494a739d4b4a5f7eb1941f742cbcd Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 13 Nov 2013 18:31:07 +0530 Subject: [PATCH 44/55] [IMP]For Supplier create supplier invoice instead of customer invoice, added address for partners. bzr revid: bth@tinyerp.com-20131113130107-ksbg3xy4jy26kbn7 --- addons/account/account_unit_test.xml | 2 +- .../l10n_be_hr_payroll_data.xml | 9 ++++++++ addons/l10n_uk/demo/demo.xml | 6 +++++- addons/lunch/lunch_demo.xml | 9 ++++++++ addons/multi_company/multi_company_demo.xml | 21 +++++++++++++++++++ addons/portal/portal_demo.xml | 4 ++++ addons/sale_crm/sale_crm_demo.xml | 2 +- 7 files changed, 50 insertions(+), 3 deletions(-) diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml index 7795c2700cc..5fb1c55b669 100644 --- a/addons/account/account_unit_test.xml +++ b/addons/account/account_unit_test.xml @@ -8,7 +8,7 @@ draft - out_invoice + in_invoice Test invoice 1 diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml index d9dcbaa66c4..bc5e64d620f 100644 --- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml +++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml @@ -6,6 +6,10 @@ Office National de Sécurité Sociale (ONSS) 1 + 54 Rue Jean Baptiste Colette BP + Attiches + 59551 +
    ONSS @@ -16,6 +20,11 @@ Fiscal Administration 1 + Shanghai Branch + Anshun Road 83, Room 1603 - + Shanghai + 200052 + Fiscal Administration diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml index 8db565f990e..59c4c8f8fb2 100644 --- a/addons/l10n_uk/demo/demo.xml +++ b/addons/l10n_uk/demo/demo.xml @@ -6,7 +6,7 @@ 12, Hill Lane HA4 7JW Ruislip - + +44 845 643 4548 08455274653 http://www.smartmode.co.uk @@ -20,6 +20,10 @@ vadim@smartmode.co.uk 1 default + 88 Wood Street, 10th floor + EC2V 7RS + London + diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml index 7e5e2f3ac8f..c0b5e41083e 100644 --- a/addons/lunch/lunch_demo.xml +++ b/addons/lunch/lunch_demo.xml @@ -18,10 +18,19 @@ Coin gourmand + Tirana + + Rr. e Durrësit, Pall. M.C. Inerte + Kati.1, Laprakë, Tirana, Shqipëri Pizza Inn + New Delhi TN + + #8, 1 st Floor,iscore complex + Gandhi Gramam,Gandhi Nagar + 607308 diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index a8c1a0f3840..fffd93e2ab9 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -4,18 +4,39 @@ OpenERP Editor + Plot No 61- Sector 8 + Faridabad (Delhi- NCR) + 121006 + OpenERP US + 2035 N. Evergreen Terrace + Arlington Heights + OpenERP IN + Top Floor, Mehta Mahal,15 + Matthew Road, Opera House + Mumbai 27 + 400004 + OpenERP BE + Avenue de l'Artisanat 2 + Braine-l'Alleud + 1420 + Odoo + RM#25-502, 126, Yijiang Road + Pudong + Shanghai + 201 + diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml index 7e48b7918f2..bc75d6ed4a9 100644 --- a/addons/portal/portal_demo.xml +++ b/addons/portal/portal_demo.xml @@ -9,6 +9,10 @@ none + Vivegnis + 4683 + + Rue Cesar de Paepe, 43 diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml index 0c2822719dd..25f653548d1 100644 --- a/addons/sale_crm/sale_crm_demo.xml +++ b/addons/sale_crm/sale_crm_demo.xml @@ -23,7 +23,7 @@ draft - out_invoice + in_invoice Test invoice 1 From dc2891188414e93db27a90bb9ea4a554d1f3e571 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Wed, 13 Nov 2013 18:59:23 +0530 Subject: [PATCH 45/55] [IMP] Added email address. bzr revid: bth@tinyerp.com-20131113132923-o39abguuq2d1he7l --- addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml | 2 ++ addons/l10n_uk/demo/demo.xml | 2 +- addons/lunch/lunch_demo.xml | 2 ++ addons/multi_company/multi_company_demo.xml | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml index bc5e64d620f..a4bd79b7668 100644 --- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml +++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml @@ -10,6 +10,7 @@ Attiches 59551 + onss@yourcompany.example.com
    ONSS @@ -25,6 +26,7 @@ Shanghai 200052 + fiscal@yourcompany.example.com Fiscal Administration diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml index 59c4c8f8fb2..03f42b2c9ba 100644 --- a/addons/l10n_uk/demo/demo.xml +++ b/addons/l10n_uk/demo/demo.xml @@ -17,7 +17,7 @@ Vadim Chobanu - vadim@smartmode.co.uk + vadim@smartmode.example.com 1 default 88 Wood Street, 10th floor diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml index c0b5e41083e..546c21e0c22 100644 --- a/addons/lunch/lunch_demo.xml +++ b/addons/lunch/lunch_demo.xml @@ -22,6 +22,7 @@ Rr. e Durrësit, Pall. M.C. Inerte Kati.1, Laprakë, Tirana, Shqipëri + coin.gourmand@yourcompany.example.com @@ -31,6 +32,7 @@ #8, 1 st Floor,iscore complex Gandhi Gramam,Gandhi Nagar 607308 + pizza.inn@yourcompany.example.com diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index fffd93e2ab9..be8c4b433b7 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -8,12 +8,14 @@ Faridabad (Delhi- NCR) 121006 + openerp.editor@yourcompany.example.com OpenERP US 2035 N. Evergreen Terrace Arlington Heights + openerp.us@yourcompany.example.com OpenERP IN @@ -22,6 +24,7 @@ Mumbai 27 400004 + openerp.in@yourcompany.example.com OpenERP BE @@ -29,6 +32,7 @@ Braine-l'Alleud 1420 + openerp.be@yourcompany.example.com Odoo @@ -37,6 +41,7 @@ Shanghai 201 + odoo@yourcompany.example.com From 00fb4f83836ebb6029a87cced477bc2f249f2d26 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Thu, 14 Nov 2013 15:37:18 +0530 Subject: [PATCH 46/55] [IMP]Removed extra template. bzr revid: bth@tinyerp.com-20131114100718-9khu6ow13zwab195 --- .../views/website_customer.xml | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index 6ab0c7618a7..797f1e433db 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -62,57 +62,6 @@ - diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml index 7e203f9dbb3..4df6b4a5998 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -21,6 +21,7 @@ +
    diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index 797f1e433db..1752a3b37ba 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -93,20 +93,18 @@ 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 @@
    From b6cb2108657854bb5185ac7d11b00e176af7071a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 28 Nov 2013 23:05:46 +0100 Subject: [PATCH 55/55] [IMP] Adding sponsorship to events bzr revid: fp@tinyerp.com-20131128220546-3kr49k0cmv24qs49 --- .../website_event_track/data/event_data.xml | 11 +++++ addons/website_event_track/models/event.py | 28 ++++++++++++- .../views/event_backend.xml | 41 ++++++++++++++++++- .../views/website_event.xml | 16 ++++++++ 4 files changed, 93 insertions(+), 3 deletions(-) diff --git a/addons/website_event_track/data/event_data.xml b/addons/website_event_track/data/event_data.xml index fe681518b55..3170da67ae6 100644 --- a/addons/website_event_track/data/event_data.xml +++ b/addons/website_event_track/data/event_data.xml @@ -2,6 +2,17 @@ + + Bronze + + + Silver + + + Gold + + + Proposals diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index 1d2903e8953..2e7b243af28 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -102,7 +102,6 @@ class event_track(osv.osv): # # Events # - class event_event(osv.osv): _inherit = "event.event" @@ -116,6 +115,7 @@ class event_event(osv.osv): _columns = { 'tag_ids': fields.many2many('event.tag', string='Tags'), 'track_ids': fields.one2many('event.track', 'event_id', 'Tracks'), + 'sponsor_ids': fields.one2many('event.sponsor', 'event_id', 'Sponsorships'), 'blog_id': fields.many2one('blog.category', 'Event Blog'), 'show_track_proposal': fields.boolean('Talks Proposals'), 'show_tracks': fields.boolean('Multiple Tracks'), @@ -137,4 +137,28 @@ class event_event(osv.osv): result.append( (_('News'), '/blog/cat/'+str(event.blog_ig.id))) if event.show_track_proposal: result.append( (_('Talk Proposals'), '/event/%s/track_proposal/' % event.id)) - return result \ No newline at end of file + return result + +# +# Sponsors +# + +class event_sponsors_type(osv.osv): + _name = "event.sponsor.type" + _order = "sequence" + _columns = { + "name": fields.char('Sponsor Type', required=True), + "sequence": fields.integer('Sequence') + } + +class event_sponsors_type(osv.osv): + _name = "event.sponsor" + _order = "sequence" + _columns = { + 'event_id': fields.many2one('event.event', 'Event', required=True), + 'sponsor_type_id': fields.many2one('event.sponsor.type', 'Sponsoring Type', required=True), + 'partner_id': fields.many2one('res.partner', 'Sponsor/Customer', required=True), + 'sequence': fields.related('sponsor_type_id', 'sequence', string='Sequence', store=True), + } + + diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index a3ef121db1a..ff9af7a46ba 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -74,6 +74,33 @@ action="action_event_track_stage" parent="event.event_configuration" groups="base.group_no_one"/> + + + Sponsor Types + event.sponsor.type + +
    + + + + +
    + + Sponsor Types + event.sponsor.type + + + + + + + + + Sponsor Types + event.sponsor.type + + + Track Tags @@ -97,7 +124,7 @@ Track Tags event.track.tag - + @@ -148,6 +175,18 @@ + + + + + + +
    + + + + +