Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-addsupplier2democontacts-jco into lp:openobject-server

  1. trunk-addsupplier2democontacts-jco
  2. Merge into trunk
Proposed by Josse Colpaert (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-addsupplier2democontacts-jco
Merge into: lp:openobject-server
Diff against target: 186 lines (+30/-2)
2 files modified
openerp/addons/base/res/res_partner_demo.xml (+1/-1)
openerp/addons/base/res/res_partner_demo.yml (+29/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-addsupplier2democontacts-jco
Reviewer Review Type Date Requested Status
Antony Lesuisse (OpenERP) Pending
Review via email: mp+140952@code.launchpad.net

Description of the change

Changed basic demo data of partners such that contact partners have same "customer, supplier" as their parent company. Also AsusTek is also customer as an invoice exists.

To post a comment you must log in.

Unmerged revisions

4714. By Josse Colpaert (OpenERP)

[IMP] Asustek is Customer as there is a demo customer invoice for AsusTek

4713. By Josse Colpaert (OpenERP)

[MERGE] Merge from trunk

4712. By Josse Colpaert (OpenERP)

[MERGE] Merge from trunk

4711. By Josse Colpaert (OpenERP)

[FIX] Need spaces after :

4710. By Josse Colpaert (OpenERP)

[IMP] Give contacts same supplier/customer as their company

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_partner_demo.xml'
2--- openerp/addons/base/res/res_partner_demo.xml 2012-10-12 09:41:21 +0000
3+++ openerp/addons/base/res/res_partner_demo.xml 2012-12-20 17:20:33 +0000
4@@ -69,7 +69,7 @@
5 <field name="name">ASUSTeK</field>
6 <field eval="[(6, 0, [ref('res_partner_category_13'), ref('res_partner_category_12')])]" name="category_id"/>
7 <field name="supplier">1</field>
8- <field eval="0" name="customer"/>
9+ <field eval="1" name="customer"/>
10 <field name="is_company">1</field>
11 <field name="city">Taipei</field>
12 <field name="zip">106</field>
13
14=== modified file 'openerp/addons/base/res/res_partner_demo.yml'
15--- openerp/addons/base/res/res_partner_demo.yml 2012-10-31 09:27:45 +0000
16+++ openerp/addons/base/res/res_partner_demo.yml 2012-12-20 17:20:33 +0000
17@@ -5,6 +5,7 @@
18 use_parent_address: True
19 function: Service Manager
20 email: tang@asustek.com
21+ supplier: True
22 -
23 !record {model: 'res.partner', id: base.res_partner_address_2}:
24 name: Joseph Walters
25@@ -12,6 +13,7 @@
26 use_parent_address: True
27 function: Store Manager
28 email: joseph.walters@asustek.com
29+ supplier: True
30 -
31 !record {model: 'res.partner', id: base.res_partner_address_3}:
32 name: Thomas Passot
33@@ -33,6 +35,7 @@
34 use_parent_address: True
35 function: Marketing Manager
36 email: chao_wang@chinaexport.com
37+ supplier: True
38 -
39 !record {model: 'res.partner', id: base.res_partner_address_6}:
40 name: Zhi Ch'ang
41@@ -40,19 +43,23 @@
42 use_parent_address: True
43 function: Supervisor
44 email: zhi_chang@chinaexport.com
45+ supplier: True
46 -
47 !record {model: 'res.partner', id: base.res_partner_address_7}:
48 name: Richard Ellis
49 parent_id: base.res_partner_4
50 use_parent_address: True
51 function: Production Supervisor
52+ customer: False
53+ supplier: True
54 -
55 !record {model: 'res.partner', id: base.res_partner_address_8}:
56 name: Paul Williams
57 parent_id: base.res_partner_4
58 use_parent_address: True
59 function: Line Mechanic
60- email:
61+ customer: False
62+ supplier: True
63 -
64 !record {model: 'res.partner', id: base.res_partner_address_9}:
65 name: Brian Williams
66@@ -60,6 +67,8 @@
67 use_parent_address: True
68 function: Computer Technician
69 email:
70+ customer: False
71+ supplier: True
72 -
73 !record {model: 'res.partner', id: base.res_partner_address_10}:
74 name: David Simpson
75@@ -80,6 +89,8 @@
76 parent_id: base.res_partner_6
77 use_parent_address: True
78 function: Electrical Supervisor
79+ supplier: True
80+ customer: False
81 -
82 !record {model: 'res.partner', id: base.res_partner_address_13}:
83 name: Charlie Bernard
84@@ -87,6 +98,7 @@
85 use_parent_address: True
86 function: Senior Associate
87 email: charlie.bernard@wealthyandsons.com
88+
89 -
90 !record {model: 'res.partner', id: base.res_partner_address_14}:
91 name: Jessica Dupont
92@@ -100,12 +112,14 @@
93 parent_id: base.res_partner_8
94 use_parent_address: True
95 function: Creative Director
96+ supplier: True
97 -
98 !record {model: 'res.partner', id: base.res_partner_address_16}:
99 name: Ayaan Agarwal
100 parent_id: base.res_partner_9
101 use_parent_address: True
102 function: Director
103+
104 -
105 !record {model: 'res.partner', id: base.res_partner_address_17}:
106 name: Daniel Jackson
107@@ -146,6 +160,7 @@
108 parent_id: base.res_partner_13
109 use_parent_address: True
110 function: Director
111+ supplier: True
112 -
113 !record {model: 'res.partner', id: base.res_partner_address_23}:
114 name: Angel Cook
115@@ -153,6 +168,7 @@
116 use_parent_address: True
117 function: General Manager
118 email: angel.cook@chamberworks.com
119+
120 -
121 !record {model: 'res.partner', id: base.res_partner_address_24}:
122 name: Robert Anderson
123@@ -173,12 +189,16 @@
124 use_parent_address: True
125 function: Software Developer
126 email:
127+ supplier: True
128+ customer: False
129 -
130 !record {model: 'res.partner', id: base.res_partner_address_27}:
131 name: Julia Rivero
132 parent_id: base.res_partner_16
133 use_parent_address: True
134 function: Technical Director
135+ supplier: True
136+ customer: False
137 -
138 !record {model: 'res.partner', id: base.res_partner_address_28}:
139 name: Benjamin Flores
140@@ -186,6 +206,7 @@
141 use_parent_address: True
142 function: Business Executive
143 email: ben@nebula.ar
144+ supplier: True
145 -
146 !record {model: 'res.partner', id: base.res_partner_address_29}:
147 name: George Wilson
148@@ -207,6 +228,8 @@
149 use_parent_address: True
150 function: Sales Representative
151 email: efoster@seagate.com
152+ supplier: True
153+ customer: False
154 -
155 !record {model: 'res.partner', id: base.res_partner_address_32}:
156 name: Robin Smith
157@@ -231,12 +254,15 @@
158 parent_id: base.res_partner_22
159 use_parent_address: True
160 function: Store Manager
161+ supplier: True
162+ customer: False
163 -
164 !record {model: 'res.partner', id: base.res_partner_address_36}:
165 name: Nhomar Hernandez
166 parent_id: base.res_partner_23
167 use_parent_address: True
168 function: Chief Executive Officer
169+ supplier: True
170 -
171 !record {model: 'res.partner', id: base.res_partner_main1}:
172 name: Mark Davis
173@@ -245,6 +271,7 @@
174 use_parent_address: True
175 function: Chief Executive Officer (CEO)
176 email: mark@yourcompany.com
177+
178 -
179 !record {model: 'res.partner', id: base.res_partner_main2}:
180 name: Roger Scott
181@@ -253,3 +280,4 @@
182 use_parent_address: True
183 function: Chief Operations Officer (COO)
184 email: roger@yourcompany.com
185+ customer: False
186\ No newline at end of file