[ADD][MERGE]Add functionnalities, merge with trunk

bzr revid: dle@openerp.com-20121108092838-fe89ohg9za3ln6y1

8 files changed, 203 insertions, 0 deletions

diff --git a/addons/base_import/static/csv/External_id_3rd_party_application_product_categories.csv b/addons/base_import/static/csv/External_id_3rd_party_application_product_categories.csv
new file mode 100644
index 00000000000..5b77f269d85
--- /dev/null
+++ b/addons/base_import/static/csv/External_id_3rd_party_application_product_categories.csv
@@ -0,0 +1,6 @@
+External ID,Name,Parent Category/External ID

+a1,Expenses,product.product_category_all

+a2,Other Products,product.product_category_all

+a3,Sellable Products,product.product_category_all

+a4,Tables,a1

+a5,Seating furniture,a2

diff --git a/addons/base_import/static/csv/External_id_3rd_party_application_products.csv b/addons/base_import/static/csv/External_id_3rd_party_application_products.csv
new file mode 100644
index 00000000000..bf2a5238696
--- /dev/null
+++ b/addons/base_import/static/csv/External_id_3rd_party_application_products.csv
@@ -0,0 +1,6 @@
+External ID,Name,Internal Reference,Category/External ID,Can be Expensed,Can be Purchased,Can be Sold,Sale Price,Cost,Supply Method,Product Type,Procurement Method

+a6,Aluminum Stool,ALS,a5,False,True,True,49.00,25.00,Buy,Stockable Product,Make to Stock

+a7,Chair,CHR,a5,False,True,True,89.00,40.00,Buy,Stockable Product,Make to Stock

+a8,Table,TBL,a4,False,True,True,169.00,100.00,Buy,Stockable Product,Make to Stock

+a9,Software Book Tutorial,SBT,a2,False,True,False,19.00,8.00,Buy,Consumable,Make to Stock

+a10,Fuel,FL,a1,True,False,False,0.30,0.25,Buy,Service,Make to Stock

diff --git a/addons/base_import/static/csv/Name_products.csv b/addons/base_import/static/csv/Name_products.csv
new file mode 100644
index 00000000000..b3fa9b572bd
--- /dev/null
+++ b/addons/base_import/static/csv/Name_products.csv
@@ -0,0 +1,6 @@
+Name,Internal Reference,Can be Expensed,Can be Purchased,Can be Sold,Sale Price,Cost,Supply Method,Product Type,Procurement Method

+Aluminum Stool,ALS,False,True,True,49.00,25.00,Buy,Stockable Product,Make to Stock

+Chair,CHR,False,True,True,89.00,40.00,Buy,Stockable Product,Make to Stock

+Table,TBL,False,True,True,169.00,100.00,Buy,Stockable Product,Make to Stock

+Software Book Tutorial,SBT,False,True,False,19.00,8.00,Buy,Consumable,Make to Stock

+Fuel,FL,True,False,False,0.30,0.25,Buy,Service,Make to Stock

diff --git a/addons/base_import/static/csv/database_import_test.sql b/addons/base_import/static/csv/database_import_test.sql
new file mode 100644
index 00000000000..1f79179145e
--- /dev/null
+++ b/addons/base_import/static/csv/database_import_test.sql
@@ -0,0 +1,155 @@
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = off;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET escape_string_warning = off;
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- Name: companies; Type: TABLE; Schema: public; Owner: fp; Tablespace: 
+--
+
+CREATE TABLE companies (
+    id integer NOT NULL,
+    company_name character varying
+);
+
+
+ALTER TABLE public.companies OWNER TO fp;
+
+--
+-- Name: companies_id_seq; Type: SEQUENCE; Schema: public; Owner: fp
+--
+
+CREATE SEQUENCE companies_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.companies_id_seq OWNER TO fp;
+
+--
+-- Name: companies_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: fp
+--
+
+ALTER SEQUENCE companies_id_seq OWNED BY companies.id;
+
+
+--
+-- Name: companies_id_seq; Type: SEQUENCE SET; Schema: public; Owner: fp
+--
+
+SELECT pg_catalog.setval('companies_id_seq', 3, true);
+
+
+--
+-- Name: persons; Type: TABLE; Schema: public; Owner: fp; Tablespace: 
+--
+
+CREATE TABLE persons (
+    id integer NOT NULL,
+    company_id integer,
+    person_name character varying
+);
+
+
+ALTER TABLE public.persons OWNER TO fp;
+
+--
+-- Name: persons_id_seq; Type: SEQUENCE; Schema: public; Owner: fp
+--
+
+CREATE SEQUENCE persons_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.persons_id_seq OWNER TO fp;
+
+--
+-- Name: persons_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: fp
+--
+
+ALTER SEQUENCE persons_id_seq OWNED BY persons.id;
+
+
+--
+-- Name: persons_id_seq; Type: SEQUENCE SET; Schema: public; Owner: fp
+--
+
+SELECT pg_catalog.setval('persons_id_seq', 4, true);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: fp
+--
+
+ALTER TABLE ONLY companies ALTER COLUMN id SET DEFAULT nextval('companies_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: fp
+--
+
+ALTER TABLE ONLY persons ALTER COLUMN id SET DEFAULT nextval('persons_id_seq'::regclass);
+
+
+--
+-- Data for Name: companies; Type: TABLE DATA; Schema: public; Owner: fp
+--
+
+COPY companies (id, company_name) FROM stdin;
+1	Bigees
+2	Organi
+3	Boum
+\.
+
+
+--
+-- Data for Name: persons; Type: TABLE DATA; Schema: public; Owner: fp
+--
+
+COPY persons (id, company_id, person_name) FROM stdin;
+1	1	Fabien
+2	1	Laurence
+3	2	Eric
+4	3	Ramsy
+\.
+
+
+--
+-- Name: companies_pkey; Type: CONSTRAINT; Schema: public; Owner: fp; Tablespace: 
+--
+
+ALTER TABLE ONLY companies
+    ADD CONSTRAINT companies_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: persons_company_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: fp
+--
+
+ALTER TABLE ONLY persons
+    ADD CONSTRAINT persons_company_id_fkey FOREIGN KEY (company_id) REFERENCES companies(id);
+
+
+--
+-- PostgreSQL database dump complete
+--
+
diff --git a/addons/base_import/static/csv/m2m_customers_tags.csv b/addons/base_import/static/csv/m2m_customers_tags.csv
new file mode 100644
index 00000000000..e6d74d4f844
--- /dev/null
+++ b/addons/base_import/static/csv/m2m_customers_tags.csv
@@ -0,0 +1,6 @@
+Name,Reference,Tags,Customer,Street,City,Country

+Credit & Leasing,3,Services,True,Central Avenue 814,Johannesburg,South Africa

+Services & Finance,5,"Consultancy Services,IT Services",True,Grove Road 5,London,United Kingdom

+Hydra Supplies,6,"Manufacturer,Retailer",True,Palm Street 9,Los Angeles,United States

+Bolts & Screws,8,"Wholesaler,Components Buyer",True,Rua Américo 1000,Campinas,Brazil

+National Parts & Supplies,18,"Manufacturer,Wholesaler",True,Guangdong Way 20,Shenzen,China

diff --git a/addons/base_import/static/csv/o2m_purchase_order_lines.csv b/addons/base_import/static/csv/o2m_purchase_order_lines.csv
new file mode 100644
index 00000000000..4778b99cb81
--- /dev/null
+++ b/addons/base_import/static/csv/o2m_purchase_order_lines.csv
@@ -0,0 +1,10 @@
+Order Date,Order Reference,Supplier,Destination,Pricelist,Order Lines / Product,Order Lines / Quantity

+2012-12-15,PO00008,ASUSTeK,Stock,Default Purchase Pricelist,ADPT,20

+,,,,,CARD,30

+,,,,,C-Case,40

+2012-12-15,PO00009,Axelor,Stock,Default Purchase Pricelist,CD,5

+,,,,,CPUa8,15

+2012-12-15,PO000010,China Export,Stock,Default Purchase Pricelist,HDD SH-1,10

+,,,,,HDD SH-2,20

+,,,,,LAP-CUS,35

+,,,,,LAP-E5,40

diff --git a/addons/base_import/static/csv/o2m_suppliers_contacts.csv b/addons/base_import/static/csv/o2m_suppliers_contacts.csv
new file mode 100644
index 00000000000..6c7be9037b8
--- /dev/null
+++ b/addons/base_import/static/csv/o2m_suppliers_contacts.csv
@@ -0,0 +1,8 @@
+Name,Address type,Street,City,Country,Tags,Supplier,Customer,Is a company,Companies that refers to partner / Parent company

+Wood y Wood Pecker,,"Snow Street, 25",Kainuu,Finland,Supplier,1,0,1,

+Roger Pecker,Default,"Snow Street, 27",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker

+Sharon Pecker,Delivery,"Snow Street, 28",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker

+Thomas Pecker,Contact,"Snow Street, 27",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker

+Vicking Direct,,"Atonium Street, 45a",Brussels,Belgium,Supplier,1,0,1,

+Yvan Holiday,Invoice,"Atonium Street, 45b",Brussels,Belgium,Supplier,1,0,0,Vicking Direct

+Jack Unsworth,Contact,"Atonium Street, 45a",Brussels,Belgium,Supplier,1,0,0,Vicking Direct

diff --git a/addons/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv b/addons/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv
new file mode 100644
index 00000000000..3b428763431
--- /dev/null
+++ b/addons/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv
@@ -0,0 +1,6 @@
+"Order Reference","Supplier","Destination","Pricelist","Order Lines / Product","Order Lines / Quantity"

+"PO000020","ASUSTeK","Stock","Default Purchase Pricelist","ADPT",20

+,,,,"CARD",30

+,,,,"C-Case",40

+"PO000021","Axelor","Stock","Default Purchase Pricelist","CD",5

+,,,,"CPUa8",15