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