Merge lp:~therp-nl/therp-addons/7.0-lp1261794 into lp:~therp-nl/therp-addons/7.0
- 7.0-lp1261794
- Merge into 7.0
Proposed by
Ronald Portier (Therp)
Status: | Merged |
---|---|
Merged at revision: | 95 |
Proposed branch: | lp:~therp-nl/therp-addons/7.0-lp1261794 |
Merge into: | lp:~therp-nl/therp-addons/7.0 |
Diff against target: |
803 lines (+0/-778) 5 files modified
trp_report_address/LICENSE (+0/-662) trp_report_address/__init__.py (+0/-2) trp_report_address/__openerp__.py (+0/-48) trp_report_address/report_sxw.py (+0/-17) trp_report_address/res_partner_address.py (+0/-49) |
To merge this branch: | bzr merge lp:~therp-nl/therp-addons/7.0-lp1261794 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stefan Rijnhart (Opener) (community) | Approve | ||
Review via email: mp+199313@code.launchpad.net |
Commit message
Description of the change
Remove trp_report_address.
Model res.partner.address no longer exists, so modifying it doesn't make sense anymore.
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory 'trp_report_address' | |||
2 | === removed file 'trp_report_address/LICENSE' | |||
3 | --- trp_report_address/LICENSE 2012-01-31 14:16:17 +0000 | |||
4 | +++ trp_report_address/LICENSE 1970-01-01 00:00:00 +0000 | |||
5 | @@ -1,662 +0,0 @@ | |||
6 | 1 | |||
7 | 2 | GNU AFFERO GENERAL PUBLIC LICENSE | ||
8 | 3 | Version 3, 19 November 2007 | ||
9 | 4 | |||
10 | 5 | Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> | ||
11 | 6 | Everyone is permitted to copy and distribute verbatim copies | ||
12 | 7 | of this license document, but changing it is not allowed. | ||
13 | 8 | |||
14 | 9 | Preamble | ||
15 | 10 | |||
16 | 11 | The GNU Affero General Public License is a free, copyleft license for | ||
17 | 12 | software and other kinds of works, specifically designed to ensure | ||
18 | 13 | cooperation with the community in the case of network server software. | ||
19 | 14 | |||
20 | 15 | The licenses for most software and other practical works are designed | ||
21 | 16 | to take away your freedom to share and change the works. By contrast, | ||
22 | 17 | our General Public Licenses are intended to guarantee your freedom to | ||
23 | 18 | share and change all versions of a program--to make sure it remains free | ||
24 | 19 | software for all its users. | ||
25 | 20 | |||
26 | 21 | When we speak of free software, we are referring to freedom, not | ||
27 | 22 | price. Our General Public Licenses are designed to make sure that you | ||
28 | 23 | have the freedom to distribute copies of free software (and charge for | ||
29 | 24 | them if you wish), that you receive source code or can get it if you | ||
30 | 25 | want it, that you can change the software or use pieces of it in new | ||
31 | 26 | free programs, and that you know you can do these things. | ||
32 | 27 | |||
33 | 28 | Developers that use our General Public Licenses protect your rights | ||
34 | 29 | with two steps: (1) assert copyright on the software, and (2) offer | ||
35 | 30 | you this License which gives you legal permission to copy, distribute | ||
36 | 31 | and/or modify the software. | ||
37 | 32 | |||
38 | 33 | A secondary benefit of defending all users' freedom is that | ||
39 | 34 | improvements made in alternate versions of the program, if they | ||
40 | 35 | receive widespread use, become available for other developers to | ||
41 | 36 | incorporate. Many developers of free software are heartened and | ||
42 | 37 | encouraged by the resulting cooperation. However, in the case of | ||
43 | 38 | software used on network servers, this result may fail to come about. | ||
44 | 39 | The GNU General Public License permits making a modified version and | ||
45 | 40 | letting the public access it on a server without ever releasing its | ||
46 | 41 | source code to the public. | ||
47 | 42 | |||
48 | 43 | The GNU Affero General Public License is designed specifically to | ||
49 | 44 | ensure that, in such cases, the modified source code becomes available | ||
50 | 45 | to the community. It requires the operator of a network server to | ||
51 | 46 | provide the source code of the modified version running there to the | ||
52 | 47 | users of that server. Therefore, public use of a modified version, on | ||
53 | 48 | a publicly accessible server, gives the public access to the source | ||
54 | 49 | code of the modified version. | ||
55 | 50 | |||
56 | 51 | An older license, called the Affero General Public License and | ||
57 | 52 | published by Affero, was designed to accomplish similar goals. This is | ||
58 | 53 | a different license, not a version of the Affero GPL, but Affero has | ||
59 | 54 | released a new version of the Affero GPL which permits relicensing under | ||
60 | 55 | this license. | ||
61 | 56 | |||
62 | 57 | The precise terms and conditions for copying, distribution and | ||
63 | 58 | modification follow. | ||
64 | 59 | |||
65 | 60 | TERMS AND CONDITIONS | ||
66 | 61 | |||
67 | 62 | 0. Definitions. | ||
68 | 63 | |||
69 | 64 | "This License" refers to version 3 of the GNU Affero General Public License. | ||
70 | 65 | |||
71 | 66 | "Copyright" also means copyright-like laws that apply to other kinds of | ||
72 | 67 | works, such as semiconductor masks. | ||
73 | 68 | |||
74 | 69 | "The Program" refers to any copyrightable work licensed under this | ||
75 | 70 | License. Each licensee is addressed as "you". "Licensees" and | ||
76 | 71 | "recipients" may be individuals or organizations. | ||
77 | 72 | |||
78 | 73 | To "modify" a work means to copy from or adapt all or part of the work | ||
79 | 74 | in a fashion requiring copyright permission, other than the making of an | ||
80 | 75 | exact copy. The resulting work is called a "modified version" of the | ||
81 | 76 | earlier work or a work "based on" the earlier work. | ||
82 | 77 | |||
83 | 78 | A "covered work" means either the unmodified Program or a work based | ||
84 | 79 | on the Program. | ||
85 | 80 | |||
86 | 81 | To "propagate" a work means to do anything with it that, without | ||
87 | 82 | permission, would make you directly or secondarily liable for | ||
88 | 83 | infringement under applicable copyright law, except executing it on a | ||
89 | 84 | computer or modifying a private copy. Propagation includes copying, | ||
90 | 85 | distribution (with or without modification), making available to the | ||
91 | 86 | public, and in some countries other activities as well. | ||
92 | 87 | |||
93 | 88 | To "convey" a work means any kind of propagation that enables other | ||
94 | 89 | parties to make or receive copies. Mere interaction with a user through | ||
95 | 90 | a computer network, with no transfer of a copy, is not conveying. | ||
96 | 91 | |||
97 | 92 | An interactive user interface displays "Appropriate Legal Notices" | ||
98 | 93 | to the extent that it includes a convenient and prominently visible | ||
99 | 94 | feature that (1) displays an appropriate copyright notice, and (2) | ||
100 | 95 | tells the user that there is no warranty for the work (except to the | ||
101 | 96 | extent that warranties are provided), that licensees may convey the | ||
102 | 97 | work under this License, and how to view a copy of this License. If | ||
103 | 98 | the interface presents a list of user commands or options, such as a | ||
104 | 99 | menu, a prominent item in the list meets this criterion. | ||
105 | 100 | |||
106 | 101 | 1. Source Code. | ||
107 | 102 | |||
108 | 103 | The "source code" for a work means the preferred form of the work | ||
109 | 104 | for making modifications to it. "Object code" means any non-source | ||
110 | 105 | form of a work. | ||
111 | 106 | |||
112 | 107 | A "Standard Interface" means an interface that either is an official | ||
113 | 108 | standard defined by a recognized standards body, or, in the case of | ||
114 | 109 | interfaces specified for a particular programming language, one that | ||
115 | 110 | is widely used among developers working in that language. | ||
116 | 111 | |||
117 | 112 | The "System Libraries" of an executable work include anything, other | ||
118 | 113 | than the work as a whole, that (a) is included in the normal form of | ||
119 | 114 | packaging a Major Component, but which is not part of that Major | ||
120 | 115 | Component, and (b) serves only to enable use of the work with that | ||
121 | 116 | Major Component, or to implement a Standard Interface for which an | ||
122 | 117 | implementation is available to the public in source code form. A | ||
123 | 118 | "Major Component", in this context, means a major essential component | ||
124 | 119 | (kernel, window system, and so on) of the specific operating system | ||
125 | 120 | (if any) on which the executable work runs, or a compiler used to | ||
126 | 121 | produce the work, or an object code interpreter used to run it. | ||
127 | 122 | |||
128 | 123 | The "Corresponding Source" for a work in object code form means all | ||
129 | 124 | the source code needed to generate, install, and (for an executable | ||
130 | 125 | work) run the object code and to modify the work, including scripts to | ||
131 | 126 | control those activities. However, it does not include the work's | ||
132 | 127 | System Libraries, or general-purpose tools or generally available free | ||
133 | 128 | programs which are used unmodified in performing those activities but | ||
134 | 129 | which are not part of the work. For example, Corresponding Source | ||
135 | 130 | includes interface definition files associated with source files for | ||
136 | 131 | the work, and the source code for shared libraries and dynamically | ||
137 | 132 | linked subprograms that the work is specifically designed to require, | ||
138 | 133 | such as by intimate data communication or control flow between those | ||
139 | 134 | subprograms and other parts of the work. | ||
140 | 135 | |||
141 | 136 | The Corresponding Source need not include anything that users | ||
142 | 137 | can regenerate automatically from other parts of the Corresponding | ||
143 | 138 | Source. | ||
144 | 139 | |||
145 | 140 | The Corresponding Source for a work in source code form is that | ||
146 | 141 | same work. | ||
147 | 142 | |||
148 | 143 | 2. Basic Permissions. | ||
149 | 144 | |||
150 | 145 | All rights granted under this License are granted for the term of | ||
151 | 146 | copyright on the Program, and are irrevocable provided the stated | ||
152 | 147 | conditions are met. This License explicitly affirms your unlimited | ||
153 | 148 | permission to run the unmodified Program. The output from running a | ||
154 | 149 | covered work is covered by this License only if the output, given its | ||
155 | 150 | content, constitutes a covered work. This License acknowledges your | ||
156 | 151 | rights of fair use or other equivalent, as provided by copyright law. | ||
157 | 152 | |||
158 | 153 | You may make, run and propagate covered works that you do not | ||
159 | 154 | convey, without conditions so long as your license otherwise remains | ||
160 | 155 | in force. You may convey covered works to others for the sole purpose | ||
161 | 156 | of having them make modifications exclusively for you, or provide you | ||
162 | 157 | with facilities for running those works, provided that you comply with | ||
163 | 158 | the terms of this License in conveying all material for which you do | ||
164 | 159 | not control copyright. Those thus making or running the covered works | ||
165 | 160 | for you must do so exclusively on your behalf, under your direction | ||
166 | 161 | and control, on terms that prohibit them from making any copies of | ||
167 | 162 | your copyrighted material outside their relationship with you. | ||
168 | 163 | |||
169 | 164 | Conveying under any other circumstances is permitted solely under | ||
170 | 165 | the conditions stated below. Sublicensing is not allowed; section 10 | ||
171 | 166 | makes it unnecessary. | ||
172 | 167 | |||
173 | 168 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. | ||
174 | 169 | |||
175 | 170 | No covered work shall be deemed part of an effective technological | ||
176 | 171 | measure under any applicable law fulfilling obligations under article | ||
177 | 172 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or | ||
178 | 173 | similar laws prohibiting or restricting circumvention of such | ||
179 | 174 | measures. | ||
180 | 175 | |||
181 | 176 | When you convey a covered work, you waive any legal power to forbid | ||
182 | 177 | circumvention of technological measures to the extent such circumvention | ||
183 | 178 | is effected by exercising rights under this License with respect to | ||
184 | 179 | the covered work, and you disclaim any intention to limit operation or | ||
185 | 180 | modification of the work as a means of enforcing, against the work's | ||
186 | 181 | users, your or third parties' legal rights to forbid circumvention of | ||
187 | 182 | technological measures. | ||
188 | 183 | |||
189 | 184 | 4. Conveying Verbatim Copies. | ||
190 | 185 | |||
191 | 186 | You may convey verbatim copies of the Program's source code as you | ||
192 | 187 | receive it, in any medium, provided that you conspicuously and | ||
193 | 188 | appropriately publish on each copy an appropriate copyright notice; | ||
194 | 189 | keep intact all notices stating that this License and any | ||
195 | 190 | non-permissive terms added in accord with section 7 apply to the code; | ||
196 | 191 | keep intact all notices of the absence of any warranty; and give all | ||
197 | 192 | recipients a copy of this License along with the Program. | ||
198 | 193 | |||
199 | 194 | You may charge any price or no price for each copy that you convey, | ||
200 | 195 | and you may offer support or warranty protection for a fee. | ||
201 | 196 | |||
202 | 197 | 5. Conveying Modified Source Versions. | ||
203 | 198 | |||
204 | 199 | You may convey a work based on the Program, or the modifications to | ||
205 | 200 | produce it from the Program, in the form of source code under the | ||
206 | 201 | terms of section 4, provided that you also meet all of these conditions: | ||
207 | 202 | |||
208 | 203 | a) The work must carry prominent notices stating that you modified | ||
209 | 204 | it, and giving a relevant date. | ||
210 | 205 | |||
211 | 206 | b) The work must carry prominent notices stating that it is | ||
212 | 207 | released under this License and any conditions added under section | ||
213 | 208 | 7. This requirement modifies the requirement in section 4 to | ||
214 | 209 | "keep intact all notices". | ||
215 | 210 | |||
216 | 211 | c) You must license the entire work, as a whole, under this | ||
217 | 212 | License to anyone who comes into possession of a copy. This | ||
218 | 213 | License will therefore apply, along with any applicable section 7 | ||
219 | 214 | additional terms, to the whole of the work, and all its parts, | ||
220 | 215 | regardless of how they are packaged. This License gives no | ||
221 | 216 | permission to license the work in any other way, but it does not | ||
222 | 217 | invalidate such permission if you have separately received it. | ||
223 | 218 | |||
224 | 219 | d) If the work has interactive user interfaces, each must display | ||
225 | 220 | Appropriate Legal Notices; however, if the Program has interactive | ||
226 | 221 | interfaces that do not display Appropriate Legal Notices, your | ||
227 | 222 | work need not make them do so. | ||
228 | 223 | |||
229 | 224 | A compilation of a covered work with other separate and independent | ||
230 | 225 | works, which are not by their nature extensions of the covered work, | ||
231 | 226 | and which are not combined with it such as to form a larger program, | ||
232 | 227 | in or on a volume of a storage or distribution medium, is called an | ||
233 | 228 | "aggregate" if the compilation and its resulting copyright are not | ||
234 | 229 | used to limit the access or legal rights of the compilation's users | ||
235 | 230 | beyond what the individual works permit. Inclusion of a covered work | ||
236 | 231 | in an aggregate does not cause this License to apply to the other | ||
237 | 232 | parts of the aggregate. | ||
238 | 233 | |||
239 | 234 | 6. Conveying Non-Source Forms. | ||
240 | 235 | |||
241 | 236 | You may convey a covered work in object code form under the terms | ||
242 | 237 | of sections 4 and 5, provided that you also convey the | ||
243 | 238 | machine-readable Corresponding Source under the terms of this License, | ||
244 | 239 | in one of these ways: | ||
245 | 240 | |||
246 | 241 | a) Convey the object code in, or embodied in, a physical product | ||
247 | 242 | (including a physical distribution medium), accompanied by the | ||
248 | 243 | Corresponding Source fixed on a durable physical medium | ||
249 | 244 | customarily used for software interchange. | ||
250 | 245 | |||
251 | 246 | b) Convey the object code in, or embodied in, a physical product | ||
252 | 247 | (including a physical distribution medium), accompanied by a | ||
253 | 248 | written offer, valid for at least three years and valid for as | ||
254 | 249 | long as you offer spare parts or customer support for that product | ||
255 | 250 | model, to give anyone who possesses the object code either (1) a | ||
256 | 251 | copy of the Corresponding Source for all the software in the | ||
257 | 252 | product that is covered by this License, on a durable physical | ||
258 | 253 | medium customarily used for software interchange, for a price no | ||
259 | 254 | more than your reasonable cost of physically performing this | ||
260 | 255 | conveying of source, or (2) access to copy the | ||
261 | 256 | Corresponding Source from a network server at no charge. | ||
262 | 257 | |||
263 | 258 | c) Convey individual copies of the object code with a copy of the | ||
264 | 259 | written offer to provide the Corresponding Source. This | ||
265 | 260 | alternative is allowed only occasionally and noncommercially, and | ||
266 | 261 | only if you received the object code with such an offer, in accord | ||
267 | 262 | with subsection 6b. | ||
268 | 263 | |||
269 | 264 | d) Convey the object code by offering access from a designated | ||
270 | 265 | place (gratis or for a charge), and offer equivalent access to the | ||
271 | 266 | Corresponding Source in the same way through the same place at no | ||
272 | 267 | further charge. You need not require recipients to copy the | ||
273 | 268 | Corresponding Source along with the object code. If the place to | ||
274 | 269 | copy the object code is a network server, the Corresponding Source | ||
275 | 270 | may be on a different server (operated by you or a third party) | ||
276 | 271 | that supports equivalent copying facilities, provided you maintain | ||
277 | 272 | clear directions next to the object code saying where to find the | ||
278 | 273 | Corresponding Source. Regardless of what server hosts the | ||
279 | 274 | Corresponding Source, you remain obligated to ensure that it is | ||
280 | 275 | available for as long as needed to satisfy these requirements. | ||
281 | 276 | |||
282 | 277 | e) Convey the object code using peer-to-peer transmission, provided | ||
283 | 278 | you inform other peers where the object code and Corresponding | ||
284 | 279 | Source of the work are being offered to the general public at no | ||
285 | 280 | charge under subsection 6d. | ||
286 | 281 | |||
287 | 282 | A separable portion of the object code, whose source code is excluded | ||
288 | 283 | from the Corresponding Source as a System Library, need not be | ||
289 | 284 | included in conveying the object code work. | ||
290 | 285 | |||
291 | 286 | A "User Product" is either (1) a "consumer product", which means any | ||
292 | 287 | tangible personal property which is normally used for personal, family, | ||
293 | 288 | or household purposes, or (2) anything designed or sold for incorporation | ||
294 | 289 | into a dwelling. In determining whether a product is a consumer product, | ||
295 | 290 | doubtful cases shall be resolved in favor of coverage. For a particular | ||
296 | 291 | product received by a particular user, "normally used" refers to a | ||
297 | 292 | typical or common use of that class of product, regardless of the status | ||
298 | 293 | of the particular user or of the way in which the particular user | ||
299 | 294 | actually uses, or expects or is expected to use, the product. A product | ||
300 | 295 | is a consumer product regardless of whether the product has substantial | ||
301 | 296 | commercial, industrial or non-consumer uses, unless such uses represent | ||
302 | 297 | the only significant mode of use of the product. | ||
303 | 298 | |||
304 | 299 | "Installation Information" for a User Product means any methods, | ||
305 | 300 | procedures, authorization keys, or other information required to install | ||
306 | 301 | and execute modified versions of a covered work in that User Product from | ||
307 | 302 | a modified version of its Corresponding Source. The information must | ||
308 | 303 | suffice to ensure that the continued functioning of the modified object | ||
309 | 304 | code is in no case prevented or interfered with solely because | ||
310 | 305 | modification has been made. | ||
311 | 306 | |||
312 | 307 | If you convey an object code work under this section in, or with, or | ||
313 | 308 | specifically for use in, a User Product, and the conveying occurs as | ||
314 | 309 | part of a transaction in which the right of possession and use of the | ||
315 | 310 | User Product is transferred to the recipient in perpetuity or for a | ||
316 | 311 | fixed term (regardless of how the transaction is characterized), the | ||
317 | 312 | Corresponding Source conveyed under this section must be accompanied | ||
318 | 313 | by the Installation Information. But this requirement does not apply | ||
319 | 314 | if neither you nor any third party retains the ability to install | ||
320 | 315 | modified object code on the User Product (for example, the work has | ||
321 | 316 | been installed in ROM). | ||
322 | 317 | |||
323 | 318 | The requirement to provide Installation Information does not include a | ||
324 | 319 | requirement to continue to provide support service, warranty, or updates | ||
325 | 320 | for a work that has been modified or installed by the recipient, or for | ||
326 | 321 | the User Product in which it has been modified or installed. Access to a | ||
327 | 322 | network may be denied when the modification itself materially and | ||
328 | 323 | adversely affects the operation of the network or violates the rules and | ||
329 | 324 | protocols for communication across the network. | ||
330 | 325 | |||
331 | 326 | Corresponding Source conveyed, and Installation Information provided, | ||
332 | 327 | in accord with this section must be in a format that is publicly | ||
333 | 328 | documented (and with an implementation available to the public in | ||
334 | 329 | source code form), and must require no special password or key for | ||
335 | 330 | unpacking, reading or copying. | ||
336 | 331 | |||
337 | 332 | 7. Additional Terms. | ||
338 | 333 | |||
339 | 334 | "Additional permissions" are terms that supplement the terms of this | ||
340 | 335 | License by making exceptions from one or more of its conditions. | ||
341 | 336 | Additional permissions that are applicable to the entire Program shall | ||
342 | 337 | be treated as though they were included in this License, to the extent | ||
343 | 338 | that they are valid under applicable law. If additional permissions | ||
344 | 339 | apply only to part of the Program, that part may be used separately | ||
345 | 340 | under those permissions, but the entire Program remains governed by | ||
346 | 341 | this License without regard to the additional permissions. | ||
347 | 342 | |||
348 | 343 | When you convey a copy of a covered work, you may at your option | ||
349 | 344 | remove any additional permissions from that copy, or from any part of | ||
350 | 345 | it. (Additional permissions may be written to require their own | ||
351 | 346 | removal in certain cases when you modify the work.) You may place | ||
352 | 347 | additional permissions on material, added by you to a covered work, | ||
353 | 348 | for which you have or can give appropriate copyright permission. | ||
354 | 349 | |||
355 | 350 | Notwithstanding any other provision of this License, for material you | ||
356 | 351 | add to a covered work, you may (if authorized by the copyright holders of | ||
357 | 352 | that material) supplement the terms of this License with terms: | ||
358 | 353 | |||
359 | 354 | a) Disclaiming warranty or limiting liability differently from the | ||
360 | 355 | terms of sections 15 and 16 of this License; or | ||
361 | 356 | |||
362 | 357 | b) Requiring preservation of specified reasonable legal notices or | ||
363 | 358 | author attributions in that material or in the Appropriate Legal | ||
364 | 359 | Notices displayed by works containing it; or | ||
365 | 360 | |||
366 | 361 | c) Prohibiting misrepresentation of the origin of that material, or | ||
367 | 362 | requiring that modified versions of such material be marked in | ||
368 | 363 | reasonable ways as different from the original version; or | ||
369 | 364 | |||
370 | 365 | d) Limiting the use for publicity purposes of names of licensors or | ||
371 | 366 | authors of the material; or | ||
372 | 367 | |||
373 | 368 | e) Declining to grant rights under trademark law for use of some | ||
374 | 369 | trade names, trademarks, or service marks; or | ||
375 | 370 | |||
376 | 371 | f) Requiring indemnification of licensors and authors of that | ||
377 | 372 | material by anyone who conveys the material (or modified versions of | ||
378 | 373 | it) with contractual assumptions of liability to the recipient, for | ||
379 | 374 | any liability that these contractual assumptions directly impose on | ||
380 | 375 | those licensors and authors. | ||
381 | 376 | |||
382 | 377 | All other non-permissive additional terms are considered "further | ||
383 | 378 | restrictions" within the meaning of section 10. If the Program as you | ||
384 | 379 | received it, or any part of it, contains a notice stating that it is | ||
385 | 380 | governed by this License along with a term that is a further | ||
386 | 381 | restriction, you may remove that term. If a license document contains | ||
387 | 382 | a further restriction but permits relicensing or conveying under this | ||
388 | 383 | License, you may add to a covered work material governed by the terms | ||
389 | 384 | of that license document, provided that the further restriction does | ||
390 | 385 | not survive such relicensing or conveying. | ||
391 | 386 | |||
392 | 387 | If you add terms to a covered work in accord with this section, you | ||
393 | 388 | must place, in the relevant source files, a statement of the | ||
394 | 389 | additional terms that apply to those files, or a notice indicating | ||
395 | 390 | where to find the applicable terms. | ||
396 | 391 | |||
397 | 392 | Additional terms, permissive or non-permissive, may be stated in the | ||
398 | 393 | form of a separately written license, or stated as exceptions; | ||
399 | 394 | the above requirements apply either way. | ||
400 | 395 | |||
401 | 396 | 8. Termination. | ||
402 | 397 | |||
403 | 398 | You may not propagate or modify a covered work except as expressly | ||
404 | 399 | provided under this License. Any attempt otherwise to propagate or | ||
405 | 400 | modify it is void, and will automatically terminate your rights under | ||
406 | 401 | this License (including any patent licenses granted under the third | ||
407 | 402 | paragraph of section 11). | ||
408 | 403 | |||
409 | 404 | However, if you cease all violation of this License, then your | ||
410 | 405 | license from a particular copyright holder is reinstated (a) | ||
411 | 406 | provisionally, unless and until the copyright holder explicitly and | ||
412 | 407 | finally terminates your license, and (b) permanently, if the copyright | ||
413 | 408 | holder fails to notify you of the violation by some reasonable means | ||
414 | 409 | prior to 60 days after the cessation. | ||
415 | 410 | |||
416 | 411 | Moreover, your license from a particular copyright holder is | ||
417 | 412 | reinstated permanently if the copyright holder notifies you of the | ||
418 | 413 | violation by some reasonable means, this is the first time you have | ||
419 | 414 | received notice of violation of this License (for any work) from that | ||
420 | 415 | copyright holder, and you cure the violation prior to 30 days after | ||
421 | 416 | your receipt of the notice. | ||
422 | 417 | |||
423 | 418 | Termination of your rights under this section does not terminate the | ||
424 | 419 | licenses of parties who have received copies or rights from you under | ||
425 | 420 | this License. If your rights have been terminated and not permanently | ||
426 | 421 | reinstated, you do not qualify to receive new licenses for the same | ||
427 | 422 | material under section 10. | ||
428 | 423 | |||
429 | 424 | 9. Acceptance Not Required for Having Copies. | ||
430 | 425 | |||
431 | 426 | You are not required to accept this License in order to receive or | ||
432 | 427 | run a copy of the Program. Ancillary propagation of a covered work | ||
433 | 428 | occurring solely as a consequence of using peer-to-peer transmission | ||
434 | 429 | to receive a copy likewise does not require acceptance. However, | ||
435 | 430 | nothing other than this License grants you permission to propagate or | ||
436 | 431 | modify any covered work. These actions infringe copyright if you do | ||
437 | 432 | not accept this License. Therefore, by modifying or propagating a | ||
438 | 433 | covered work, you indicate your acceptance of this License to do so. | ||
439 | 434 | |||
440 | 435 | 10. Automatic Licensing of Downstream Recipients. | ||
441 | 436 | |||
442 | 437 | Each time you convey a covered work, the recipient automatically | ||
443 | 438 | receives a license from the original licensors, to run, modify and | ||
444 | 439 | propagate that work, subject to this License. You are not responsible | ||
445 | 440 | for enforcing compliance by third parties with this License. | ||
446 | 441 | |||
447 | 442 | An "entity transaction" is a transaction transferring control of an | ||
448 | 443 | organization, or substantially all assets of one, or subdividing an | ||
449 | 444 | organization, or merging organizations. If propagation of a covered | ||
450 | 445 | work results from an entity transaction, each party to that | ||
451 | 446 | transaction who receives a copy of the work also receives whatever | ||
452 | 447 | licenses to the work the party's predecessor in interest had or could | ||
453 | 448 | give under the previous paragraph, plus a right to possession of the | ||
454 | 449 | Corresponding Source of the work from the predecessor in interest, if | ||
455 | 450 | the predecessor has it or can get it with reasonable efforts. | ||
456 | 451 | |||
457 | 452 | You may not impose any further restrictions on the exercise of the | ||
458 | 453 | rights granted or affirmed under this License. For example, you may | ||
459 | 454 | not impose a license fee, royalty, or other charge for exercise of | ||
460 | 455 | rights granted under this License, and you may not initiate litigation | ||
461 | 456 | (including a cross-claim or counterclaim in a lawsuit) alleging that | ||
462 | 457 | any patent claim is infringed by making, using, selling, offering for | ||
463 | 458 | sale, or importing the Program or any portion of it. | ||
464 | 459 | |||
465 | 460 | 11. Patents. | ||
466 | 461 | |||
467 | 462 | A "contributor" is a copyright holder who authorizes use under this | ||
468 | 463 | License of the Program or a work on which the Program is based. The | ||
469 | 464 | work thus licensed is called the contributor's "contributor version". | ||
470 | 465 | |||
471 | 466 | A contributor's "essential patent claims" are all patent claims | ||
472 | 467 | owned or controlled by the contributor, whether already acquired or | ||
473 | 468 | hereafter acquired, that would be infringed by some manner, permitted | ||
474 | 469 | by this License, of making, using, or selling its contributor version, | ||
475 | 470 | but do not include claims that would be infringed only as a | ||
476 | 471 | consequence of further modification of the contributor version. For | ||
477 | 472 | purposes of this definition, "control" includes the right to grant | ||
478 | 473 | patent sublicenses in a manner consistent with the requirements of | ||
479 | 474 | this License. | ||
480 | 475 | |||
481 | 476 | Each contributor grants you a non-exclusive, worldwide, royalty-free | ||
482 | 477 | patent license under the contributor's essential patent claims, to | ||
483 | 478 | make, use, sell, offer for sale, import and otherwise run, modify and | ||
484 | 479 | propagate the contents of its contributor version. | ||
485 | 480 | |||
486 | 481 | In the following three paragraphs, a "patent license" is any express | ||
487 | 482 | agreement or commitment, however denominated, not to enforce a patent | ||
488 | 483 | (such as an express permission to practice a patent or covenant not to | ||
489 | 484 | sue for patent infringement). To "grant" such a patent license to a | ||
490 | 485 | party means to make such an agreement or commitment not to enforce a | ||
491 | 486 | patent against the party. | ||
492 | 487 | |||
493 | 488 | If you convey a covered work, knowingly relying on a patent license, | ||
494 | 489 | and the Corresponding Source of the work is not available for anyone | ||
495 | 490 | to copy, free of charge and under the terms of this License, through a | ||
496 | 491 | publicly available network server or other readily accessible means, | ||
497 | 492 | then you must either (1) cause the Corresponding Source to be so | ||
498 | 493 | available, or (2) arrange to deprive yourself of the benefit of the | ||
499 | 494 | patent license for this particular work, or (3) arrange, in a manner | ||
500 | 495 | consistent with the requirements of this License, to extend the patent | ||
501 | 496 | license to downstream recipients. "Knowingly relying" means you have | ||
502 | 497 | actual knowledge that, but for the patent license, your conveying the | ||
503 | 498 | covered work in a country, or your recipient's use of the covered work | ||
504 | 499 | in a country, would infringe one or more identifiable patents in that | ||
505 | 500 | country that you have reason to believe are valid. | ||
506 | 501 | |||
507 | 502 | If, pursuant to or in connection with a single transaction or | ||
508 | 503 | arrangement, you convey, or propagate by procuring conveyance of, a | ||
509 | 504 | covered work, and grant a patent license to some of the parties | ||
510 | 505 | receiving the covered work authorizing them to use, propagate, modify | ||
511 | 506 | or convey a specific copy of the covered work, then the patent license | ||
512 | 507 | you grant is automatically extended to all recipients of the covered | ||
513 | 508 | work and works based on it. | ||
514 | 509 | |||
515 | 510 | A patent license is "discriminatory" if it does not include within | ||
516 | 511 | the scope of its coverage, prohibits the exercise of, or is | ||
517 | 512 | conditioned on the non-exercise of one or more of the rights that are | ||
518 | 513 | specifically granted under this License. You may not convey a covered | ||
519 | 514 | work if you are a party to an arrangement with a third party that is | ||
520 | 515 | in the business of distributing software, under which you make payment | ||
521 | 516 | to the third party based on the extent of your activity of conveying | ||
522 | 517 | the work, and under which the third party grants, to any of the | ||
523 | 518 | parties who would receive the covered work from you, a discriminatory | ||
524 | 519 | patent license (a) in connection with copies of the covered work | ||
525 | 520 | conveyed by you (or copies made from those copies), or (b) primarily | ||
526 | 521 | for and in connection with specific products or compilations that | ||
527 | 522 | contain the covered work, unless you entered into that arrangement, | ||
528 | 523 | or that patent license was granted, prior to 28 March 2007. | ||
529 | 524 | |||
530 | 525 | Nothing in this License shall be construed as excluding or limiting | ||
531 | 526 | any implied license or other defenses to infringement that may | ||
532 | 527 | otherwise be available to you under applicable patent law. | ||
533 | 528 | |||
534 | 529 | 12. No Surrender of Others' Freedom. | ||
535 | 530 | |||
536 | 531 | If conditions are imposed on you (whether by court order, agreement or | ||
537 | 532 | otherwise) that contradict the conditions of this License, they do not | ||
538 | 533 | excuse you from the conditions of this License. If you cannot convey a | ||
539 | 534 | covered work so as to satisfy simultaneously your obligations under this | ||
540 | 535 | License and any other pertinent obligations, then as a consequence you may | ||
541 | 536 | not convey it at all. For example, if you agree to terms that obligate you | ||
542 | 537 | to collect a royalty for further conveying from those to whom you convey | ||
543 | 538 | the Program, the only way you could satisfy both those terms and this | ||
544 | 539 | License would be to refrain entirely from conveying the Program. | ||
545 | 540 | |||
546 | 541 | 13. Remote Network Interaction; Use with the GNU General Public License. | ||
547 | 542 | |||
548 | 543 | Notwithstanding any other provision of this License, if you modify the | ||
549 | 544 | Program, your modified version must prominently offer all users | ||
550 | 545 | interacting with it remotely through a computer network (if your version | ||
551 | 546 | supports such interaction) an opportunity to receive the Corresponding | ||
552 | 547 | Source of your version by providing access to the Corresponding Source | ||
553 | 548 | from a network server at no charge, through some standard or customary | ||
554 | 549 | means of facilitating copying of software. This Corresponding Source | ||
555 | 550 | shall include the Corresponding Source for any work covered by version 3 | ||
556 | 551 | of the GNU General Public License that is incorporated pursuant to the | ||
557 | 552 | following paragraph. | ||
558 | 553 | |||
559 | 554 | Notwithstanding any other provision of this License, you have | ||
560 | 555 | permission to link or combine any covered work with a work licensed | ||
561 | 556 | under version 3 of the GNU General Public License into a single | ||
562 | 557 | combined work, and to convey the resulting work. The terms of this | ||
563 | 558 | License will continue to apply to the part which is the covered work, | ||
564 | 559 | but the work with which it is combined will remain governed by version | ||
565 | 560 | 3 of the GNU General Public License. | ||
566 | 561 | |||
567 | 562 | 14. Revised Versions of this License. | ||
568 | 563 | |||
569 | 564 | The Free Software Foundation may publish revised and/or new versions of | ||
570 | 565 | the GNU Affero General Public License from time to time. Such new versions | ||
571 | 566 | will be similar in spirit to the present version, but may differ in detail to | ||
572 | 567 | address new problems or concerns. | ||
573 | 568 | |||
574 | 569 | Each version is given a distinguishing version number. If the | ||
575 | 570 | Program specifies that a certain numbered version of the GNU Affero General | ||
576 | 571 | Public License "or any later version" applies to it, you have the | ||
577 | 572 | option of following the terms and conditions either of that numbered | ||
578 | 573 | version or of any later version published by the Free Software | ||
579 | 574 | Foundation. If the Program does not specify a version number of the | ||
580 | 575 | GNU Affero General Public License, you may choose any version ever published | ||
581 | 576 | by the Free Software Foundation. | ||
582 | 577 | |||
583 | 578 | If the Program specifies that a proxy can decide which future | ||
584 | 579 | versions of the GNU Affero General Public License can be used, that proxy's | ||
585 | 580 | public statement of acceptance of a version permanently authorizes you | ||
586 | 581 | to choose that version for the Program. | ||
587 | 582 | |||
588 | 583 | Later license versions may give you additional or different | ||
589 | 584 | permissions. However, no additional obligations are imposed on any | ||
590 | 585 | author or copyright holder as a result of your choosing to follow a | ||
591 | 586 | later version. | ||
592 | 587 | |||
593 | 588 | 15. Disclaimer of Warranty. | ||
594 | 589 | |||
595 | 590 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY | ||
596 | 591 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT | ||
597 | 592 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY | ||
598 | 593 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, | ||
599 | 594 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
600 | 595 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM | ||
601 | 596 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF | ||
602 | 597 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. | ||
603 | 598 | |||
604 | 599 | 16. Limitation of Liability. | ||
605 | 600 | |||
606 | 601 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
607 | 602 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS | ||
608 | 603 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY | ||
609 | 604 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE | ||
610 | 605 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF | ||
611 | 606 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD | ||
612 | 607 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), | ||
613 | 608 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF | ||
614 | 609 | SUCH DAMAGES. | ||
615 | 610 | |||
616 | 611 | 17. Interpretation of Sections 15 and 16. | ||
617 | 612 | |||
618 | 613 | If the disclaimer of warranty and limitation of liability provided | ||
619 | 614 | above cannot be given local legal effect according to their terms, | ||
620 | 615 | reviewing courts shall apply local law that most closely approximates | ||
621 | 616 | an absolute waiver of all civil liability in connection with the | ||
622 | 617 | Program, unless a warranty or assumption of liability accompanies a | ||
623 | 618 | copy of the Program in return for a fee. | ||
624 | 619 | |||
625 | 620 | END OF TERMS AND CONDITIONS | ||
626 | 621 | |||
627 | 622 | How to Apply These Terms to Your New Programs | ||
628 | 623 | |||
629 | 624 | If you develop a new program, and you want it to be of the greatest | ||
630 | 625 | possible use to the public, the best way to achieve this is to make it | ||
631 | 626 | free software which everyone can redistribute and change under these terms. | ||
632 | 627 | |||
633 | 628 | To do so, attach the following notices to the program. It is safest | ||
634 | 629 | to attach them to the start of each source file to most effectively | ||
635 | 630 | state the exclusion of warranty; and each file should have at least | ||
636 | 631 | the "copyright" line and a pointer to where the full notice is found. | ||
637 | 632 | |||
638 | 633 | <one line to give the program's name and a brief idea of what it does.> | ||
639 | 634 | Copyright (C) <year> <name of author> | ||
640 | 635 | |||
641 | 636 | This program is free software: you can redistribute it and/or modify | ||
642 | 637 | it under the terms of the GNU Affero General Public License as published by | ||
643 | 638 | the Free Software Foundation, either version 3 of the License, or | ||
644 | 639 | (at your option) any later version. | ||
645 | 640 | |||
646 | 641 | This program is distributed in the hope that it will be useful, | ||
647 | 642 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
648 | 643 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
649 | 644 | GNU Affero General Public License for more details. | ||
650 | 645 | |||
651 | 646 | You should have received a copy of the GNU Affero General Public License | ||
652 | 647 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
653 | 648 | |||
654 | 649 | Also add information on how to contact you by electronic and paper mail. | ||
655 | 650 | |||
656 | 651 | If your software can interact with users remotely through a computer | ||
657 | 652 | network, you should also make sure that it provides a way for users to | ||
658 | 653 | get its source. For example, if your program is a web application, its | ||
659 | 654 | interface could display a "Source" link that leads users to an archive | ||
660 | 655 | of the code. There are many ways you could offer source, and different | ||
661 | 656 | solutions will be better for different programs; see section 13 for the | ||
662 | 657 | specific requirements. | ||
663 | 658 | |||
664 | 659 | You should also get your employer (if you work as a programmer) or school, | ||
665 | 660 | if any, to sign a "copyright disclaimer" for the program, if necessary. | ||
666 | 661 | For more information on this, and how to apply and follow the GNU AGPL, see | ||
667 | 662 | <http://www.gnu.org/licenses/>. | ||
668 | 663 | 0 | ||
669 | === removed file 'trp_report_address/__init__.py' | |||
670 | --- trp_report_address/__init__.py 2012-01-31 14:16:17 +0000 | |||
671 | +++ trp_report_address/__init__.py 1970-01-01 00:00:00 +0000 | |||
672 | @@ -1,2 +0,0 @@ | |||
673 | 1 | import res_partner_address | ||
674 | 2 | import report_sxw | ||
675 | 3 | 0 | ||
676 | === removed file 'trp_report_address/__openerp__.py' | |||
677 | --- trp_report_address/__openerp__.py 2012-12-28 14:10:30 +0000 | |||
678 | +++ trp_report_address/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
679 | @@ -1,48 +0,0 @@ | |||
680 | 1 | # -*- coding: utf-8 -*- | ||
681 | 2 | ############################################################################## | ||
682 | 3 | # | ||
683 | 4 | # OpenERP, Open Source Management Solution | ||
684 | 5 | # This module copyright (C) 2012 Therp BV (<http://therp.nl>). | ||
685 | 6 | # | ||
686 | 7 | # This program is free software: you can redistribute it and/or modify | ||
687 | 8 | # it under the terms of the GNU Affero General Public License as | ||
688 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
689 | 10 | # License, or (at your option) any later version. | ||
690 | 11 | # | ||
691 | 12 | # This program is distributed in the hope that it will be useful, | ||
692 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
693 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
694 | 15 | # GNU Affero General Public License for more details. | ||
695 | 16 | # | ||
696 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
697 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
698 | 19 | # | ||
699 | 20 | ############################################################################## | ||
700 | 21 | { | ||
701 | 22 | "name" : "Report addresses without country", | ||
702 | 23 | "version" : "0.1r5", | ||
703 | 24 | "author" : "Therp BV", | ||
704 | 25 | "category": 'Generic Modules', | ||
705 | 26 | 'complexity': "normal", | ||
706 | 27 | "description": """ | ||
707 | 28 | In certain reports, we may opt to display partner addresses without a country, | ||
708 | 29 | as this may not be informative if the country is the same as the company's | ||
709 | 30 | partner. This module provides a function that does not print the partner | ||
710 | 31 | address' country in that case. | ||
711 | 32 | |||
712 | 33 | To use this function, call display_address(address, company) in your rml | ||
713 | 34 | reports instead of display_address(address). | ||
714 | 35 | |||
715 | 36 | """, | ||
716 | 37 | 'website': 'http://therp.nl', | ||
717 | 38 | 'images' : [], | ||
718 | 39 | 'init_xml': [], | ||
719 | 40 | "depends" : ['base'], | ||
720 | 41 | 'update_xml': [ | ||
721 | 42 | ], | ||
722 | 43 | 'demo_xml': [], | ||
723 | 44 | 'test': [ ], | ||
724 | 45 | 'installable': False, | ||
725 | 46 | 'active': False, | ||
726 | 47 | } | ||
727 | 48 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | ||
728 | 49 | 0 | ||
729 | === removed file 'trp_report_address/report_sxw.py' | |||
730 | --- trp_report_address/report_sxw.py 2012-01-31 14:16:17 +0000 | |||
731 | +++ trp_report_address/report_sxw.py 1970-01-01 00:00:00 +0000 | |||
732 | @@ -1,17 +0,0 @@ | |||
733 | 1 | from report.report_sxw import rml_parse, rml_parents, rml_tag | ||
734 | 2 | |||
735 | 3 | def display_address(self, address_browse_record, company=None): | ||
736 | 4 | """ | ||
737 | 5 | Return a custom method to get a formatted address if displaying | ||
738 | 6 | the country should be avoided in certain circumstances | ||
739 | 7 | """ | ||
740 | 8 | |||
741 | 9 | if not company: | ||
742 | 10 | return self.pool.get('res.partner.address')._display_address( | ||
743 | 11 | self.cr, self.uid, address_browse_record) | ||
744 | 12 | else: | ||
745 | 13 | return self.pool.get('res.partner.address')._display_address_custom( | ||
746 | 14 | self.cr, self.uid, address_browse_record, company) | ||
747 | 15 | |||
748 | 16 | # monkey patch the report object to accomodate our changes | ||
749 | 17 | rml_parse.display_address = display_address | ||
750 | 18 | 0 | ||
751 | === removed file 'trp_report_address/res_partner_address.py' | |||
752 | --- trp_report_address/res_partner_address.py 2012-01-31 14:16:17 +0000 | |||
753 | +++ trp_report_address/res_partner_address.py 1970-01-01 00:00:00 +0000 | |||
754 | @@ -1,49 +0,0 @@ | |||
755 | 1 | # -*- coding: utf-8 -*- | ||
756 | 2 | from osv import osv, fields | ||
757 | 3 | |||
758 | 4 | class res_partner_address(osv.osv): | ||
759 | 5 | _inherit = 'res.partner.address' | ||
760 | 6 | |||
761 | 7 | def _display_address_custom(self, cr, uid, address, company, context=None): | ||
762 | 8 | ''' | ||
763 | 9 | This method is almost identical to the one in base/res/res_partner.py, | ||
764 | 10 | but it does not print the country if this is equal to the company partner's | ||
765 | 11 | country, unless we print the company partner's own address. | ||
766 | 12 | |||
767 | 13 | Note that this method has a different signature than the original one, | ||
768 | 14 | as it passes the company browse record. | ||
769 | 15 | |||
770 | 16 | :param address: browse record of the res.partner.address to format | ||
771 | 17 | :param company: browse record of the res.company | ||
772 | 18 | :returns: the address formatted in a display that fit its country habits (or the default ones | ||
773 | 19 | if not country is specified) | ||
774 | 20 | :rtype: string | ||
775 | 21 | ''' | ||
776 | 22 | # get the address format | ||
777 | 23 | address_format = address.country_id and address.country_id.address_format or \ | ||
778 | 24 | '%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s' | ||
779 | 25 | # get the information that will be injected into the display format | ||
780 | 26 | args = { | ||
781 | 27 | 'state_code': address.state_id and address.state_id.code or '', | ||
782 | 28 | 'state_name': address.state_id and address.state_id.name or '', | ||
783 | 29 | 'country_code': address.country_id and address.country_id.code or '', | ||
784 | 30 | 'country_name': address.country_id and address.country_id.name or '', | ||
785 | 31 | } | ||
786 | 32 | |||
787 | 33 | |||
788 | 34 | # custom changes here | ||
789 | 35 | if (address.country_id and company and company.partner_id.country and | ||
790 | 36 | company.partner_id.country.id == address.country_id.id and | ||
791 | 37 | not (address.partner_id and | ||
792 | 38 | address.partner_id.id == company.partner_id.id) | ||
793 | 39 | ): | ||
794 | 40 | args['country_name'] = '' | ||
795 | 41 | # end of custom changes | ||
796 | 42 | |||
797 | 43 | address_field = ['title', 'street', 'street2', 'zip', 'city'] | ||
798 | 44 | for field in address_field : | ||
799 | 45 | args[field] = getattr(address, field) or '' | ||
800 | 46 | |||
801 | 47 | return address_format % args | ||
802 | 48 | |||
803 | 49 | res_partner_address() |