Merge lp:~openerp-mexico-team-activo/openerp-mexico-localization/diot_report into lp:openerp-mexico-localization/6.0
- diot_report
- Merge into 6.0
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-mexico-team-activo/openerp-mexico-localization/diot_report |
Merge into: | lp:openerp-mexico-localization/6.0 |
Diff against target: |
155251 lines (has conflicts)
Conflict adding file account_aged_partner_balance_vw. Moved existing file to account_aged_partner_balance_vw.moved. Conflict adding file account_analytic_btree. Moved existing file to account_analytic_btree.moved. Conflict adding file account_invoice_number_v6. Moved existing file to account_invoice_number_v6.moved. Text conflict in base_vat_mx/base_vat.py Conflict adding file base_vat_mx_compatibility. Moved existing file to base_vat_mx_compatibility.moved. Conflict adding file base_vat_split. Moved existing file to base_vat_split.moved. Conflict adding file invoice_ftp. Moved existing file to invoice_ftp.moved. Conflict adding file invoice_report. Moved existing file to invoice_report.moved. Conflict adding file invoice_wkf_security. Moved existing file to invoice_wkf_security.moved. Conflict adding file l10n_mx_chart_of_accounts. Moved existing file to l10n_mx_chart_of_accounts.moved. Conflict adding file l10n_mx_company_cif. Moved existing file to l10n_mx_company_cif.moved. Conflict adding file l10n_mx_facturae/SAT/certificados/password.txt. Moved existing file to l10n_mx_facturae/SAT/certificados/password.txt.moved. Conflict adding file l10n_mx_facturae/SAT/reporte_mensual_2_0.xslt. Moved existing file to l10n_mx_facturae/SAT/reporte_mensual_2_0.xslt.moved. Contents conflict in l10n_mx_facturae/__openerp__.py Path conflict: l10n_mx_facturae/i18n/es_MX.po / <deleted> Text conflict in l10n_mx_facturae/invoice.py Text conflict in l10n_mx_facturae/report/invoice_facturae_pdf.rml Contents conflict in l10n_mx_facturae/report/invoice_facturae_pdf.sxw Conflict adding file l10n_mx_facturae/security/l10n_mx_facturae_security.xml. Moved existing file to l10n_mx_facturae/security/l10n_mx_facturae_security.xml.moved. Conflict adding file l10n_mx_facturae/wizard/wizard_invoice_facturae_txt_v6.py. Moved existing file to l10n_mx_facturae/wizard/wizard_invoice_facturae_txt_v6.py.moved. Conflict adding file l10n_mx_facturae/wizard/wizard_invoice_facturae_txt_v6_view.xml. Moved existing file to l10n_mx_facturae/wizard/wizard_invoice_facturae_txt_v6_view.xml.moved. Conflict adding file l10n_mx_facturae/wizard/wizard_invoice_facturae_xml_v6.py. Moved existing file to l10n_mx_facturae/wizard/wizard_invoice_facturae_xml_v6.py.moved. Conflict adding file l10n_mx_facturae/wizard/wizard_invoice_facturae_xml_v6_view.xml. Moved existing file to l10n_mx_facturae/wizard/wizard_invoice_facturae_xml_v6_view.xml.moved. Conflict adding file l10n_mx_facturae_cbb/ir_sequence_approval.py. Moved existing file to l10n_mx_facturae_cbb/ir_sequence_approval.py.moved. Conflict adding file l10n_mx_facturae_cbb/ir_sequence_view_v6.xml. Moved existing file to l10n_mx_facturae_cbb/ir_sequence_view_v6.xml.moved. Text conflict in l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml Contents conflict in l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw Conflict adding file l10n_mx_facturae_cbb/security/l10n_mx_facturae_cbb_security.xml. Moved existing file to l10n_mx_facturae_cbb/security/l10n_mx_facturae_cbb_security.xml.moved. Conflict adding file l10n_mx_facturae_cer. Moved existing file to l10n_mx_facturae_cer.moved. Conflict adding file l10n_mx_facturae_email. Moved existing file to l10n_mx_facturae_email.moved. Conflict adding file l10n_mx_facturae_lib. Moved existing file to l10n_mx_facturae_lib.moved. Conflict adding file l10n_mx_facturae_pac_ftp. Moved existing file to l10n_mx_facturae_pac_ftp.moved. Conflict adding file l10n_mx_facturae_pac_sf. Moved existing file to l10n_mx_facturae_pac_sf.moved. Conflict adding file l10n_mx_facturae_seq. Moved existing file to l10n_mx_facturae_seq.moved. Conflict adding file l10n_mx_import_info. Moved existing file to l10n_mx_import_info.moved. Conflict adding file l10n_mx_invoice_amount_to_text. Moved existing file to l10n_mx_invoice_amount_to_text.moved. Conflict adding file l10n_mx_invoice_datetime. Moved existing file to l10n_mx_invoice_datetime.moved. Path conflict: l10n_mx_invoice_datetime.moved/patchs / <deleted> Conflict adding file l10n_mx_invoice_discount. Moved existing file to l10n_mx_invoice_discount.moved. Conflict adding file l10n_mx_invoice_tax_ref. Moved existing file to l10n_mx_invoice_tax_ref.moved. Conflict adding file l10n_mx_params_pac. Moved existing file to l10n_mx_params_pac.moved. Conflict adding file l10n_mx_partner_address. Moved existing file to l10n_mx_partner_address.moved. Conflict adding file partner_credit_limit. Moved existing file to partner_credit_limit.moved. Conflict adding file upload_ftp. Moved existing file to upload_ftp.moved. |
To merge this branch: | bzr merge lp:~openerp-mexico-team-activo/openerp-mexico-localization/diot_report |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nhomar - Vauxoo | Pending | ||
Review via email: mp+66712@code.launchpad.net |
Commit message
Description of the change
Agregando modulo de Declaracion Informativa de operaciones con terceros ( DIOT )
Nhomar - Vauxoo (nhomar) wrote : | # |
- 61. By echeverrifm <email address hidden>
-
[ADD] Columns for DOITs
- 62. By echeverrifm <email address hidden>
-
[IMP] add view for partner_view.xml
- 63. By echeverrifm <email address hidden>
-
[IMP] add view for partner_view.xml
- 64. By echeverrifm <email address hidden>
-
[FIX] fixing function for find payment
- 65. By echeverrifm <email address hidden>
-
[FIX] function for find payment and taxes
- 66. By echeverrifm <email address hidden>
-
[FIX] function for find payment and taxes
- 67. By echeverrifm <email address hidden>
-
[FIX] add filter for partner, VAT and Type TAXES
- 68. By echeverrifm <email address hidden>
-
[IMP] Add some documents
- 69. By echeverrifm <email address hidden>
-
[FIX] change function for accumulated payment
- 70. By echeverrifm <email address hidden>
-
[ADD] Module for storage and validate invoice suppliers
- 71. By echeverrifm <email address hidden>
-
[IMP] Add function for generate report on TXT
- 72. By echeverrifm <email address hidden>
-
[FIX] Remove some print and string
- 73. By echeverrifm <email address hidden>
-
[ADD] Add some countrys for DIOT reporter
- 74. By echeverrifm <email address hidden>
-
[ADD] Add some countrys for DIOT reporter and field for CURP in partners
- 75. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 76. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 77. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 78. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 79. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 80. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report and view for CURP in partner form
- 81. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 82. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 83. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 84. By echeverrifm <email address hidden>
-
[ADD] Add more countrys for DIOT report
- 85. By echeverrifm <email address hidden>
-
[FIX] remove doubble country for DIOT report
- 86. By echeverrifm <email address hidden>
-
[ADD] Add first files in module for addendas (l10n_mx_addendas)]
- 87. By echeverrifm <email address hidden>
-
[ADD] Add IVA Report
- 88. By echeverrifm <email address hidden>
-
[FIX] Fixing some fields for diot
- 89. By echeverrifm <email address hidden>
-
[ADD] Module of IVA Declaration for Mexico
- 90. By echeverrifm <email address hidden>
-
[ADD] Module of electronic invoice in CFDI for Mexico
- 91. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 92. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 93. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 94. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 95. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 96. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 97. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 98. By echeverrifm <email address hidden>
-
[REF] Change chart account
- 99. By echeverrifm <email address hidden>
-
[REF] Change account for taxes
- 100. By echeverrifm <email address hidden>
-
[REF] Change chart account for taxes
- 101. By echeverrifm <email address hidden>
-
[ADD] add some financial account
- 102. By echeverrifm <email address hidden>
-
[FIX] fix a child account
- 103. By echeverrifm <email address hidden>
-
[FIX] wizard for chart account
- 104. By echeverrifm <email address hidden>
-
[FIX] wizard for chart account
- 105. By echeverrifm <email address hidden>
-
[FIX] wizard for chart account
- 106. By echeverrifm <email address hidden>
-
[REF] modify view on V6.1
- 107. By echeverrifm <email address hidden>
-
[REF] modify view on V6.1
- 108. By echeverrifm <email address hidden>
-
[REF] modify view on V6.1
- 109. By echeverrifm <email address hidden>
-
[REF] modify view on V6.1
- 110. By echeverrifm <email address hidden>
-
[REF] modify view on V6.1
- 111. By echeverrifm <email address hidden>
-
[REF] modify view on V6.1
- 112. By echeverrifm <email address hidden>
-
[ADD] Add field type taxes and view
- 113. By echeverrifm <email address hidden>
-
[ADD] Add field type taxes and view
- 114. By echeverrifm <email address hidden>
-
[ADD] efactura addendas
- 115. By echeverrifm <email address hidden>
-
[ADD] efactura addendas
- 116. By echeverrifm <email address hidden>
-
[REF] modify partner_view.xml of diot_report
- 117. By echeverrifm <email address hidden>
-
[FIX] diot report
- 118. By echeverrifm <email address hidden>
-
[FIX] diot report
- 119. By echeverrifm <email address hidden>
-
[FIX] diot report
- 120. By echeverrifm <email address hidden>
-
[FIX] diot report
- 121. By echeverrifm <email address hidden>
-
[FIX] diot report
- 122. By echeverrifm <email address hidden>
-
[FIX] diot report
- 123. By echeverrifm <email address hidden>
-
[ADD] Add module
- 124. By echeverrifm <email address hidden>
-
[ADD] Add module
- 125. By echeverrifm <email address hidden>
-
[ADD] Add module
- 126. By echeverrifm <email address hidden>
-
[ADD] Add module
- 127. By echeverrifm <email address hidden>
-
[ADD] Add module
- 128. By echeverrifm <email address hidden>
-
[ADD] Add module
- 129. By echeverrifm <email address hidden>
-
[ADD] Add module
- 130. By echeverrifm <email address hidden>
-
[ADD] Add module
- 131. By echeverrifm <email address hidden>
-
[ADD] Add module
- 132. By echeverrifm <email address hidden>
-
[ADD] Add module
- 133. By echeverrifm <email address hidden>
-
[ADD] Add module
- 134. By echeverrifm <email address hidden>
-
[ADD] Add module
- 135. By echeverrifm <email address hidden>
-
[FIX] some problems with facturae
- 136. By echeverrifm <email address hidden>
-
[ADD] facturae 6.1
- 137. By echeverrifm <email address hidden>
-
[ADD] folder for webservice soriana
- 138. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 139. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 140. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 141. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 142. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 143. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 144. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 145. By echeverrifm <email address hidden>
-
[REF] l10m_mx_addendas
- 146. By echeverrifm <email address hidden>
-
[ADD] Add Modules
- 147. By echeverrifm <email address hidden>
-
[ADD] add Report of invoice
- 148. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 149. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 150. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 151. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 152. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 153. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 154. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 155. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 156. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 157. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 158. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 159. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 160. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 161. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 162. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 163. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 164. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 165. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 166. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 167. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 168. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 169. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 170. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 171. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 172. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 173. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 174. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 175. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 176. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 177. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 178. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 179. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 180. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 181. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 182. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 183. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 184. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 185. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 186. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 187. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 188. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 189. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 190. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 191. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 192. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 193. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 194. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 195. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 196. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for invoice CDF 2.2
- 197. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 198. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 199. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 200. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 201. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 202. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 203. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 204. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 205. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 206. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 207. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 208. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
Unmerged revisions
- 208. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 207. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 206. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 205. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 204. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 203. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 202. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 201. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 200. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
- 199. By echeverrifm <email address hidden>
-
[REF] Edit RML Report for Sale Order
Preview Diff
1 | === added directory 'account_aged_partner_balance_vw' |
2 | === renamed directory 'account_aged_partner_balance_vw' => 'account_aged_partner_balance_vw.moved' |
3 | === added file 'account_aged_partner_balance_vw/__init__.py' |
4 | --- account_aged_partner_balance_vw/__init__.py 1970-01-01 00:00:00 +0000 |
5 | +++ account_aged_partner_balance_vw/__init__.py 2012-07-03 08:49:19 +0000 |
6 | @@ -0,0 +1,28 @@ |
7 | +# -*- encoding: utf-8 -*- |
8 | +########################################################################### |
9 | +# Module Writen to OpenERP, Open Source Management Solution |
10 | +# |
11 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
12 | +# All Rights Reserved. |
13 | +# info Vauxoo (info@vauxoo.com) |
14 | +############################################################################ |
15 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
16 | +############################################################################ |
17 | +# |
18 | +# This program is free software: you can redistribute it and/or modify |
19 | +# it under the terms of the GNU Affero General Public License as |
20 | +# published by the Free Software Foundation, either version 3 of the |
21 | +# License, or (at your option) any later version. |
22 | +# |
23 | +# This program is distributed in the hope that it will be useful, |
24 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
25 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
26 | +# GNU Affero General Public License for more details. |
27 | +# |
28 | +# You should have received a copy of the GNU Affero General Public License |
29 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
30 | +# |
31 | +############################################################################## |
32 | + |
33 | +import account_aged_partner_balance_vw |
34 | +import wizard |
35 | |
36 | === added file 'account_aged_partner_balance_vw/__openerp__.py' |
37 | --- account_aged_partner_balance_vw/__openerp__.py 1970-01-01 00:00:00 +0000 |
38 | +++ account_aged_partner_balance_vw/__openerp__.py 2012-07-03 08:49:19 +0000 |
39 | @@ -0,0 +1,44 @@ |
40 | +# -*- encoding: utf-8 -*- |
41 | +########################################################################### |
42 | +# Module Writen to OpenERP, Open Source Management Solution |
43 | +# |
44 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
45 | +# All Rights Reserved. |
46 | +# info Vauxoo (info@vauxoo.com) |
47 | +############################################################################ |
48 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
49 | +############################################################################ |
50 | +# |
51 | +# This program is free software: you can redistribute it and/or modify |
52 | +# it under the terms of the GNU Affero General Public License as |
53 | +# published by the Free Software Foundation, either version 3 of the |
54 | +# License, or (at your option) any later version. |
55 | +# |
56 | +# This program is distributed in the hope that it will be useful, |
57 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
58 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
59 | +# GNU Affero General Public License for more details. |
60 | +# |
61 | +# You should have received a copy of the GNU Affero General Public License |
62 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
63 | +# |
64 | +############################################################################## |
65 | + |
66 | +{ |
67 | + "name" : "Report Account Aged Partner Balance view", |
68 | + "version" : "1.0", |
69 | + "author" : "Vauxoo", |
70 | + "category" : "Localization/Mexico", |
71 | + "description" : """This module creates a sql view for Account Aged Partner Balance today.""", |
72 | + "website" : "http://www.vauxoo.com/", |
73 | + "license" : "AGPL-3", |
74 | + "depends" : ["account"], |
75 | + "init_xml" : [], |
76 | + "demo_xml" : [], |
77 | + "update_xml" : [ |
78 | + "account_aged_partner_balance_vw_wizard.xml", |
79 | + "account_aged_partner_balance_vw_view.xml", |
80 | + ], |
81 | + "installable" : True, |
82 | + "active" : False, |
83 | +} |
84 | |
85 | === added file 'account_aged_partner_balance_vw/account_aged_partner_balance_vw.py' |
86 | --- account_aged_partner_balance_vw/account_aged_partner_balance_vw.py 1970-01-01 00:00:00 +0000 |
87 | +++ account_aged_partner_balance_vw/account_aged_partner_balance_vw.py 2012-07-03 08:49:19 +0000 |
88 | @@ -0,0 +1,147 @@ |
89 | +# -*- encoding: utf-8 -*- |
90 | +########################################################################### |
91 | +# Module Writen to OpenERP, Open Source Management Solution |
92 | +# |
93 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
94 | +# All Rights Reserved. |
95 | +# info Vauxoo (info@vauxoo.com) |
96 | +############################################################################ |
97 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
98 | +############################################################################ |
99 | +# |
100 | +# This program is free software: you can redistribute it and/or modify |
101 | +# it under the terms of the GNU Affero General Public License as |
102 | +# published by the Free Software Foundation, either version 3 of the |
103 | +# License, or (at your option) any later version. |
104 | +# |
105 | +# This program is distributed in the hope that it will be useful, |
106 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
107 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
108 | +# GNU Affero General Public License for more details. |
109 | +# |
110 | +# You should have received a copy of the GNU Affero General Public License |
111 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
112 | +# |
113 | +############################################################################## |
114 | + |
115 | +from osv import osv |
116 | +from osv import fields |
117 | +import tools |
118 | +from tools.translate import _ |
119 | +import netsvc |
120 | +import time |
121 | +import os |
122 | + |
123 | +class account_aged_partner_balance_vw(osv.osv): |
124 | + _name = 'account.aged.partner.balance.vw' |
125 | + _rec_name = 'partner_id' |
126 | + _auto = False |
127 | + _order = 'partner_id' |
128 | + |
129 | + _columns = { |
130 | + 'partner_id': fields.many2one('res.partner', u'Partner'), |
131 | + 'total': fields.float(u'Total'), |
132 | + 'not_due': fields.float(u'Not Due'), |
133 | + 'days_due_01to30': fields.float(u'01/30'), |
134 | + 'days_due_31to60': fields.float(u'31/60'), |
135 | + 'days_due_61to90': fields.float(u'61/90'), |
136 | + 'days_due_91to120': fields.float(u'91/120'), |
137 | + 'days_due_121togr': fields.float(u'+121'), |
138 | + #'pending': fields.float(u'Pending'), |
139 | + 'company_id': fields.many2one('res.company', u'Company'), |
140 | + 'currency_company_id': fields.many2one('res.currency', u'Company Currency'), |
141 | + #'currency_src_id': fields.many2one('res.currency', u'Source Currency'), |
142 | + } |
143 | + |
144 | + def init(self, cr): |
145 | + ###FALTA AGREGAR INNER JOIN CON COMPANY, PARA CASAR LA MONEDA POR DEFAULT Y TRANSFORMAR TODO A LA MONEDA DE LA COMPANY. |
146 | + move_obj = self.pool.get('account.move.line') |
147 | + ctx = {} |
148 | + #ACCOUNT_TYPE = ['receivable']#customer |
149 | + #ACCOUNT_TYPE = ['payable']#supplier |
150 | + #ACCOUNT_TYPE = ['payable','receivable']#supplier & customer |
151 | + #MOVE_STATE = ['posted']#, 'draft'] |
152 | + move_query = move_obj._query_get(cr, 1, obj='l', context=ctx) |
153 | + #print 'en aged partner balance nueva modificacion---------------------------------------' |
154 | + ##########query en version 97 con errores |
155 | + #~ full_query ='''SELECT * |
156 | + #~ FROM ( |
157 | + #~ SELECT MIN(l.id) as id, l.partner_id, |
158 | + #~ SUM(l.debit-l.credit) AS "total", |
159 | + #~ SUM(CASE WHEN days_due <= 00 THEN l.debit-l.credit ELSE 0 END ) AS "not_due", |
160 | + #~ SUM(CASE WHEN days_due BETWEEN 01 AND 30 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_01to30", |
161 | + #~ SUM(CASE WHEN days_due BETWEEN 31 AND 60 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_31to60", |
162 | + #~ SUM(CASE WHEN days_due BETWEEN 61 AND 90 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_61to90", |
163 | + #~ SUM(CASE WHEN days_due BETWEEN 91 AND 120 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_91to120", |
164 | + #~ SUM(CASE WHEN days_due >=121 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_121togr", |
165 | + #~ COALESCE( l.currency_id, res_company.currency_id) AS "currency_src_id", |
166 | + #~ res_company.currency_id AS "currency_company_id", |
167 | + #~ l.company_id,l.currency_id as lcurrency |
168 | + #~ FROM account_move_line l |
169 | + #~ INNER JOIN |
170 | + #~ ( |
171 | + #~ SELECT id, EXTRACT(DAY FROM (now() - COALESCE(lt.date_maturity,lt.date))) AS days_due |
172 | + #~ FROM account_move_line lt |
173 | + #~ --WHERE --lt.state, si ya finalizo no tiene fecha de vencimiento |
174 | + #~ ) l2 |
175 | + #~ ON l2.id = l.id |
176 | + #~ INNER JOIN account_account |
177 | + #~ ON account_account.id = l.account_id |
178 | + #~ INNER JOIN res_company |
179 | + #~ ON account_account.company_id = res_company.id |
180 | + #~ INNER JOIN account_move |
181 | + #~ ON account_move.id = l.move_id |
182 | + #~ WHERE account_account.active |
183 | + #~ AND (account_account.type IN ('receivable')) |
184 | + #~ --AND (l.reconcile_id IS NULL) |
185 | + #~ AND account_move.state = 'posted' |
186 | + #~ --AND %s |
187 | + #~ --GROUP BY l.partner_id, l.currency_id, l.company_id, res_company.currency_id,l.currency_id --original |
188 | + #~ GROUP BY l.partner_id, COALESCE(l.currency_id, res_company.currency_id), l.company_id, res_company.currency_id |
189 | + #~ ) vw |
190 | + #~ WHERE total <> 0 |
191 | + #~ and lcurrency is null '''%(move_query) |
192 | + |
193 | + #modificado el 07/07/2011 Isaac |
194 | + |
195 | + full_query = '''select * from ( |
196 | + SELECT MIN(l.id) as id, l.partner_id, |
197 | + SUM(l.debit-l.credit) AS "total", |
198 | + SUM(CASE WHEN days_due <= 00 THEN l.debit-l.credit ELSE 0 END ) AS "not_due", |
199 | + SUM(CASE WHEN days_due BETWEEN 01 AND 30 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_01to30", |
200 | + SUM(CASE WHEN days_due BETWEEN 31 AND 60 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_31to60", |
201 | + SUM(CASE WHEN days_due BETWEEN 61 AND 90 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_61to90", |
202 | + SUM(CASE WHEN days_due BETWEEN 91 AND 120 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_91to120", |
203 | + SUM(CASE WHEN days_due >=121 THEN l.debit-l.credit ELSE 0 END ) AS "days_due_121togr", |
204 | + --COALESCE( l.currency_id, res_company.currency_id) AS "currency_src_id", |
205 | + --res_company.currency_id AS "currency_src_id", |
206 | + res_company.currency_id AS "currency_company_id", |
207 | + l.company_id |
208 | + FROM account_move_line l |
209 | + INNER JOIN |
210 | + (--Subquery add days_due to account_move_line |
211 | + SELECT id, EXTRACT(DAY FROM (now() - COALESCE(lt.date_maturity,lt.date))) AS days_due |
212 | + FROM account_move_line lt |
213 | + --WHERE --lt.state, si ya finalizo no tiene fecha de vencimiento |
214 | + ) l2 |
215 | + ON l2.id = l.id |
216 | + |
217 | + INNER JOIN account_account |
218 | + ON account_account.id = l.account_id |
219 | + INNER JOIN res_company |
220 | + ON account_account.company_id = res_company.id |
221 | + INNER JOIN account_move |
222 | + ON account_move.id = l.move_id |
223 | + WHERE account_account.active |
224 | + AND (account_account.type IN ('receivable')) |
225 | + AND (l.reconcile_id IS NULL) |
226 | + AND account_move.state = 'posted' |
227 | + GROUP BY l.partner_id, l.company_id, res_company.currency_id--, l.currency_id |
228 | + ) vw |
229 | + WHERE total <> 0''' |
230 | + |
231 | + tools.drop_view_if_exists(cr, '%s'%(self._name.replace('.', '_')) ) |
232 | + cr.execute("""CREATE OR REPLACE VIEW %s AS ( |
233 | + %s |
234 | + )"""%( self._name.replace('.', '_'), full_query ) ) |
235 | +account_aged_partner_balance_vw() |
236 | |
237 | === added file 'account_aged_partner_balance_vw/account_aged_partner_balance_vw_view.xml' |
238 | --- account_aged_partner_balance_vw/account_aged_partner_balance_vw_view.xml 1970-01-01 00:00:00 +0000 |
239 | +++ account_aged_partner_balance_vw/account_aged_partner_balance_vw_view.xml 2012-07-03 08:49:19 +0000 |
240 | @@ -0,0 +1,47 @@ |
241 | +<?xml version="1.0" encoding="utf-8"?> |
242 | +<openerp> |
243 | + <data> |
244 | + |
245 | + <record model="ir.ui.view" id="view_account_aged_partner_balance_vw_tree"> |
246 | + <field name="name">view.account.aged.partner.balance.vw.tree</field> |
247 | + <field name="model">account.aged.partner.balance.vw</field> |
248 | + <field name="type">tree</field> |
249 | + <field name="arch" type="xml"> |
250 | + <tree string="Aged Partner Balance View"> |
251 | + <field name="partner_id"/> |
252 | + <field name="total" sum="Total"/> |
253 | + <button name="%(wizard_open_move_line)d" string="Total Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':False,'days_due_end': False}"/> |
254 | + <field name="not_due" sum="Not due"/> |
255 | + <button name="%(wizard_open_move_line)d" string="Not Due Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':False,'days_due_end': 0}"/> |
256 | + <field name="days_due_01to30" sum="01/30"/> |
257 | + <button name="%(wizard_open_move_line)d" string="01/30 Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':01,'days_due_end': 30}"/> |
258 | + <field name="days_due_31to60" sum="31/60"/> |
259 | + <button name="%(wizard_open_move_line)d" string="31/60 Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':31,'days_due_end': 60}"/> |
260 | + <field name="days_due_61to90" sum="61/90"/> |
261 | + <button name="%(wizard_open_move_line)d" string="61/90 Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':61,'days_due_end': 90}"/> |
262 | + <field name="days_due_91to120" sum="91/120"/> |
263 | + <button name="%(wizard_open_move_line)d" string="91/120 Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':91,'days_due_end': 120}"/> |
264 | + <field name="days_due_121togr" sum="+121"/> |
265 | + <button name="%(wizard_open_move_line)d" string="+121 Open Moves" type="action" icon="gtk-go-forward" context="{'days_due_start':121,'days_due_end': False}"/> |
266 | + <field name="company_id"/> |
267 | + <field name="currency_company_id"/> |
268 | +<!-- |
269 | + <field name="currency_src_id"/> |
270 | +--> |
271 | + </tree> |
272 | + </field> |
273 | + </record> |
274 | + <record id="action_account_aged_partner_balance_vw" model="ir.actions.act_window"> |
275 | + <field name="name">Aged Partner Balance View</field> |
276 | + <field name="res_model">account.aged.partner.balance.vw</field> |
277 | + <field name="view_type">form</field> |
278 | + <field name="view_id" ref="view_account_aged_partner_balance_vw_tree"/> |
279 | + <field name="view_mode">tree</field> |
280 | + <!--<field name="context">{'search_default_posted': 0}</field>--> |
281 | + <!--<field name="search_view_id" ref="account.view_account_move_line_filter"/>--> |
282 | + <field name="help"></field> |
283 | + </record> |
284 | + <menuitem action="action_account_aged_partner_balance_vw" id="menu_action_account_aged_partner_balance_vw" parent="account.menu_finance_legal_statement" sequence="100"/> |
285 | + |
286 | + </data> |
287 | +</openerp> |
288 | |
289 | === added file 'account_aged_partner_balance_vw/account_aged_partner_balance_vw_wizard.xml' |
290 | --- account_aged_partner_balance_vw/account_aged_partner_balance_vw_wizard.xml 1970-01-01 00:00:00 +0000 |
291 | +++ account_aged_partner_balance_vw/account_aged_partner_balance_vw_wizard.xml 2012-07-03 08:49:19 +0000 |
292 | @@ -0,0 +1,21 @@ |
293 | +<?xml version="1.0" encoding="utf-8"?> |
294 | +<openerp> |
295 | + <data> |
296 | + |
297 | + <wizard id="wizard_open_move_line" |
298 | + name="wizard.open.move.line" |
299 | + string="Open Moves Lines" |
300 | + model="account.invoice" |
301 | + menu="False" |
302 | + /> |
303 | + <!-- |
304 | + <menuitem id="menu_wizard_open_move_line" |
305 | + name="Open Movew" parent="account.menu_finance_receivables" |
306 | + action="wizard_open_move_line" |
307 | + type="wizard" |
308 | + sequence="150" |
309 | + /> |
310 | + --> |
311 | + |
312 | + </data> |
313 | +</openerp> |
314 | |
315 | === added file 'account_aged_partner_balance_vw/balance.py' |
316 | --- account_aged_partner_balance_vw/balance.py 1970-01-01 00:00:00 +0000 |
317 | +++ account_aged_partner_balance_vw/balance.py 2012-07-03 08:49:19 +0000 |
318 | @@ -0,0 +1,15 @@ |
319 | +query_template = "SELECT %s FROM account_account" |
320 | +columns = range(1,5) |
321 | +for i in columns: |
322 | + #sum_colums = '0 AS col%s'%(columns) |
323 | + #print map(lambda x: x, columns) |
324 | + cols_query = ', '.join( map(lambda x: i==x and 'SUM(debit+credit) AS col%s'%(x,) or '0 AS col%s'%(x,), columns) ) |
325 | + dates_query = ' ' |
326 | + dates_query += ' BETWEEN %s AND %s)' |
327 | + #query_full = query_template%(sum_colums) |
328 | +#print query_full |
329 | + |
330 | +#cfd_data_invoices_str = '\n'.join( map(lambda x: '|'.join(x) + '|', cfd_data_invoices) ) |
331 | + |
332 | +for i in range(5)[::-1]: |
333 | + print i |
334 | \ No newline at end of file |
335 | |
336 | === added directory 'account_aged_partner_balance_vw/i18n' |
337 | === added file 'account_aged_partner_balance_vw/i18n/es_MX.po' |
338 | --- account_aged_partner_balance_vw/i18n/es_MX.po 1970-01-01 00:00:00 +0000 |
339 | +++ account_aged_partner_balance_vw/i18n/es_MX.po 2012-07-03 08:49:19 +0000 |
340 | @@ -0,0 +1,130 @@ |
341 | +# Translation of OpenERP Server. |
342 | +# This file contains the translation of the following modules: |
343 | +# * account_aged_partner_balance_vw |
344 | +# |
345 | +msgid "" |
346 | +msgstr "" |
347 | +"Project-Id-Version: OpenERP Server 6.0.3\n" |
348 | +"Report-Msgid-Bugs-To: support@openerp.com\n" |
349 | +"POT-Creation-Date: 2011-12-15 03:07+0000\n" |
350 | +"PO-Revision-Date: 2011-12-14 21:15-0600\n" |
351 | +"Last-Translator: Ariel E. Figueroa <arielfigue@gmail.com>\n" |
352 | +"Language-Team: \n" |
353 | +"MIME-Version: 1.0\n" |
354 | +"Content-Type: text/plain; charset=UTF-8\n" |
355 | +"Content-Transfer-Encoding: 8bit\n" |
356 | +"Plural-Forms: \n" |
357 | + |
358 | +#. module: account_aged_partner_balance_vw |
359 | +#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_balance_vw |
360 | +msgid "account.aged.partner.balance.vw" |
361 | +msgstr "account.aged.partner.balance.vw" |
362 | + |
363 | +#. module: account_aged_partner_balance_vw |
364 | +#: view:account.aged.partner.balance.vw:0 |
365 | +msgid "91/120 Open Moves" |
366 | +msgstr "91/120 Mov Abiertos" |
367 | + |
368 | +#. module: account_aged_partner_balance_vw |
369 | +#: view:account.aged.partner.balance.vw:0 |
370 | +msgid "+121 Open Moves" |
371 | +msgstr "+121 Mov abiertos" |
372 | + |
373 | +#. module: account_aged_partner_balance_vw |
374 | +#: view:account.aged.partner.balance.vw:0 |
375 | +msgid "Not due" |
376 | +msgstr "No Vencido" |
377 | + |
378 | +#. module: account_aged_partner_balance_vw |
379 | +#: view:account.aged.partner.balance.vw:0 |
380 | +msgid "01/30 Open Moves" |
381 | +msgstr "01/30 Mov abiertos" |
382 | + |
383 | +#. module: account_aged_partner_balance_vw |
384 | +#: field:account.aged.partner.balance.vw,company_id:0 |
385 | +msgid "Company" |
386 | +msgstr "Compania" |
387 | + |
388 | +#. module: account_aged_partner_balance_vw |
389 | +#: view:account.aged.partner.balance.vw:0 |
390 | +msgid "Not Due Open Moves" |
391 | +msgstr "Mov Abiertos no vencidos" |
392 | + |
393 | +#. module: account_aged_partner_balance_vw |
394 | +#: view:account.aged.partner.balance.vw:0 |
395 | +#: field:account.aged.partner.balance.vw,days_due_31to60:0 |
396 | +msgid "31/60" |
397 | +msgstr "31/60" |
398 | + |
399 | +#. module: account_aged_partner_balance_vw |
400 | +#: view:account.aged.partner.balance.vw:0 |
401 | +msgid "31/60 Open Moves" |
402 | +msgstr "31/60 Mov abiertos" |
403 | + |
404 | +#. module: account_aged_partner_balance_vw |
405 | +#: field:account.aged.partner.balance.vw,not_due:0 |
406 | +msgid "Not Due" |
407 | +msgstr "No Vencido" |
408 | + |
409 | +#. module: account_aged_partner_balance_vw |
410 | +#: model:ir.actions.wizard,name:account_aged_partner_balance_vw.wizard_open_move_line |
411 | +msgid "Open Moves Lines" |
412 | +msgstr "Lineas Mov abiertos" |
413 | + |
414 | +#. module: account_aged_partner_balance_vw |
415 | +#: view:account.aged.partner.balance.vw:0 |
416 | +#: field:account.aged.partner.balance.vw,days_due_01to30:0 |
417 | +msgid "01/30" |
418 | +msgstr "01/30" |
419 | + |
420 | +#. module: account_aged_partner_balance_vw |
421 | +#: view:account.aged.partner.balance.vw:0 |
422 | +#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_account_aged_partner_balance_vw |
423 | +#: model:ir.ui.menu,name:account_aged_partner_balance_vw.menu_action_account_aged_partner_balance_vw |
424 | +msgid "Aged Partner Balance View" |
425 | +msgstr "Antiguedad de saldos" |
426 | + |
427 | +#. module: account_aged_partner_balance_vw |
428 | +#: field:account.aged.partner.balance.vw,currency_company_id:0 |
429 | +msgid "Company Currency" |
430 | +msgstr "Moneda de la compania" |
431 | + |
432 | +#. module: account_aged_partner_balance_vw |
433 | +#: view:account.aged.partner.balance.vw:0 |
434 | +#: field:account.aged.partner.balance.vw,days_due_121togr:0 |
435 | +msgid "+121" |
436 | +msgstr "+121" |
437 | + |
438 | +#. module: account_aged_partner_balance_vw |
439 | +#: view:account.aged.partner.balance.vw:0 |
440 | +msgid "61/90 Open Moves" |
441 | +msgstr "61/90 Mov abiertos" |
442 | + |
443 | +#. module: account_aged_partner_balance_vw |
444 | +#: field:account.aged.partner.balance.vw,partner_id:0 |
445 | +msgid "Partner" |
446 | +msgstr "Empresa" |
447 | + |
448 | +#. module: account_aged_partner_balance_vw |
449 | +#: view:account.aged.partner.balance.vw:0 |
450 | +#: field:account.aged.partner.balance.vw,days_due_61to90:0 |
451 | +msgid "61/90" |
452 | +msgstr "61/90" |
453 | + |
454 | +#. module: account_aged_partner_balance_vw |
455 | +#: view:account.aged.partner.balance.vw:0 |
456 | +#: field:account.aged.partner.balance.vw,days_due_91to120:0 |
457 | +msgid "91/120" |
458 | +msgstr "91/120" |
459 | + |
460 | +#. module: account_aged_partner_balance_vw |
461 | +#: view:account.aged.partner.balance.vw:0 |
462 | +#: field:account.aged.partner.balance.vw,total:0 |
463 | +msgid "Total" |
464 | +msgstr "Total" |
465 | + |
466 | +#. module: account_aged_partner_balance_vw |
467 | +#: view:account.aged.partner.balance.vw:0 |
468 | +msgid "Total Open Moves" |
469 | +msgstr "Total Mov abiertos" |
470 | + |
471 | |
472 | === added directory 'account_aged_partner_balance_vw/wizard' |
473 | === added file 'account_aged_partner_balance_vw/wizard/__init__.py' |
474 | --- account_aged_partner_balance_vw/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
475 | +++ account_aged_partner_balance_vw/wizard/__init__.py 2012-07-03 08:49:19 +0000 |
476 | @@ -0,0 +1,27 @@ |
477 | +# -*- encoding: utf-8 -*- |
478 | +########################################################################### |
479 | +# Module Writen to OpenERP, Open Source Management Solution |
480 | +# |
481 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
482 | +# All Rights Reserved. |
483 | +# info Vauxoo (info@vauxoo.com) |
484 | +############################################################################ |
485 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
486 | +############################################################################ |
487 | +# |
488 | +# This program is free software: you can redistribute it and/or modify |
489 | +# it under the terms of the GNU Affero General Public License as |
490 | +# published by the Free Software Foundation, either version 3 of the |
491 | +# License, or (at your option) any later version. |
492 | +# |
493 | +# This program is distributed in the hope that it will be useful, |
494 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
495 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
496 | +# GNU Affero General Public License for more details. |
497 | +# |
498 | +# You should have received a copy of the GNU Affero General Public License |
499 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
500 | +# |
501 | +############################################################################## |
502 | + |
503 | +import wizard_open_move_line |
504 | |
505 | === added file 'account_aged_partner_balance_vw/wizard/wizard_open_move_line.py' |
506 | --- account_aged_partner_balance_vw/wizard/wizard_open_move_line.py 1970-01-01 00:00:00 +0000 |
507 | +++ account_aged_partner_balance_vw/wizard/wizard_open_move_line.py 2012-07-03 08:49:19 +0000 |
508 | @@ -0,0 +1,87 @@ |
509 | +# -*- encoding: utf-8 -*- |
510 | +########################################################################### |
511 | +# Module Writen to OpenERP, Open Source Management Solution |
512 | +# |
513 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
514 | +# All Rights Reserved. |
515 | +# info Vauxoo (info@vauxoo.com) |
516 | +############################################################################ |
517 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
518 | +############################################################################ |
519 | +# |
520 | +# This program is free software: you can redistribute it and/or modify |
521 | +# it under the terms of the GNU Affero General Public License as |
522 | +# published by the Free Software Foundation, either version 3 of the |
523 | +# License, or (at your option) any later version. |
524 | +# |
525 | +# This program is distributed in the hope that it will be useful, |
526 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
527 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
528 | +# GNU Affero General Public License for more details. |
529 | +# |
530 | +# You should have received a copy of the GNU Affero General Public License |
531 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
532 | +# |
533 | +############################################################################## |
534 | + |
535 | +import wizard |
536 | +import pooler |
537 | + |
538 | +class wizard_open_move_line(wizard.interface): |
539 | + def _open_window(self, cr, uid, data, context={}): |
540 | + if not context: |
541 | + context = {} |
542 | + mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data') |
543 | + act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window') |
544 | + aged_partner_balance_vw_obj = pooler.get_pool(cr.dbname).get('account.aged.partner.balance.vw') |
545 | + partner_ids = [aged_partner_balance_vw.partner_id and aged_partner_balance_vw.partner_id.id or False for aged_partner_balance_vw in aged_partner_balance_vw_obj.browse(cr, uid, data['ids'], context=context)] |
546 | + #result = mod_obj._get_id(cr, uid, 'account', 'action_account_moves_all_a') |
547 | + result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select') |
548 | + id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] |
549 | + result = act_obj.read(cr, uid, [id])[0] |
550 | + #result['context'] = {'partner_id': partner_ids} |
551 | + #result['domain'] = [('partner_id','in',partner_ids), ('account_id.type','=','receivable')] |
552 | + where_query = [] |
553 | + days_due_start = context.get('days_due_start', False) |
554 | + if not days_due_start is False: |
555 | + where_query.append( 'days_due >= %d'%( days_due_start ) ) |
556 | + |
557 | + days_due_end = context.get('days_due_end', False) |
558 | + if not days_due_end is False: |
559 | + where_query.append( 'days_due <= %d'%( days_due_end ) ) |
560 | + #where_query_str = (where_query and ' WHERE ' or '') + ' AND '.join( where_query ) |
561 | + where_query_str = (where_query and ' AND ' or '') + ' AND '.join( where_query ) |
562 | + query = """SELECT l.id as id--, l.partner_id, l.company_id |
563 | + FROM account_move_line l |
564 | + INNER JOIN |
565 | + ( |
566 | + SELECT id, EXTRACT(DAY FROM (now() - COALESCE(lt.date_maturity,lt.date))) AS days_due |
567 | + FROM account_move_line lt |
568 | + ) l2 |
569 | + ON l2.id = l.id |
570 | + INNER JOIN account_account |
571 | + ON account_account.id = l.account_id |
572 | + INNER JOIN res_company |
573 | + ON account_account.company_id = res_company.id |
574 | + INNER JOIN account_move |
575 | + ON account_move.id = l.move_id |
576 | + WHERE account_account.active |
577 | + AND (account_account.type IN ('receivable')) |
578 | + AND (l.reconcile_id IS NULL) |
579 | + AND account_move.state = 'posted' |
580 | + AND l.reconcile_id is null --and l.currency_id is null |
581 | + """+where_query_str |
582 | + cr.execute(query) |
583 | + res = cr.fetchall() |
584 | + move_ids = [r[0] for r in res] |
585 | + result['domain'] = [('partner_id','in',partner_ids), ('id','in',move_ids)] |
586 | + return result |
587 | + |
588 | + states = { |
589 | + 'init': { |
590 | + 'actions': [], |
591 | + 'result': {'type': 'action', 'action': _open_window, 'state': 'end'} |
592 | + } |
593 | + } |
594 | +wizard_open_move_line('wizard.open.move.line') |
595 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
596 | |
597 | === added directory 'account_analytic_btree' |
598 | === renamed directory 'account_analytic_btree' => 'account_analytic_btree.moved' |
599 | === added file 'account_analytic_btree/__init__.py' |
600 | --- account_analytic_btree/__init__.py 1970-01-01 00:00:00 +0000 |
601 | +++ account_analytic_btree/__init__.py 2012-07-03 08:49:19 +0000 |
602 | @@ -0,0 +1,29 @@ |
603 | +# -*- encoding: utf-8 -*- |
604 | +########################################################################### |
605 | +# Module Writen to OpenERP, Open Source Management Solution |
606 | +# |
607 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
608 | +# All Rights Reserved. |
609 | +# info Vauxoo (info@vauxoo.com) |
610 | +############################################################################ |
611 | +# Coded by: Juan Carlos Hernandez Funes (info@vauxoo.com) |
612 | +# Planned by: Moises Augusto Lopez Calderon (info@vauxoo.com) |
613 | +############################################################################ |
614 | +# |
615 | +# This program is free software: you can redistribute it and/or modify |
616 | +# it under the terms of the GNU Affero General Public License as |
617 | +# published by the Free Software Foundation, either version 3 of the |
618 | +# License, or (at your option) any later version. |
619 | +# |
620 | +# This program is distributed in the hope that it will be useful, |
621 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
622 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
623 | +# GNU Affero General Public License for more details. |
624 | +# |
625 | +# You should have received a copy of the GNU Affero General Public License |
626 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
627 | +# |
628 | +############################################################################## |
629 | + |
630 | + |
631 | +import account_analytic_btree |
632 | |
633 | === added file 'account_analytic_btree/__openerp__.py' |
634 | --- account_analytic_btree/__openerp__.py 1970-01-01 00:00:00 +0000 |
635 | +++ account_analytic_btree/__openerp__.py 2012-07-03 08:49:19 +0000 |
636 | @@ -0,0 +1,40 @@ |
637 | +# -*- encoding: utf-8 -*- |
638 | +########################################################################### |
639 | +# Module Writen to OpenERP, Open Source Management Solution |
640 | +# |
641 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
642 | +# All Rights Reserved. |
643 | +# info Vauxoo (info@vauxoo.com) |
644 | +############################################################################ |
645 | +# Coded by: Juan Carlos Hernandez Funes (info@vauxoo.com) |
646 | +# Planned by: Moises Augusto Lopez Calderon (info@vauxoo.com) |
647 | +############################################################################ |
648 | +# |
649 | +# This program is free software: you can redistribute it and/or modify |
650 | +# it under the terms of the GNU Affero General Public License as |
651 | +# published by the Free Software Foundation, either version 3 of the |
652 | +# License, or (at your option) any later version. |
653 | +# |
654 | +# This program is distributed in the hope that it will be useful, |
655 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
656 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
657 | +# GNU Affero General Public License for more details. |
658 | +# |
659 | +# You should have received a copy of the GNU Affero General Public License |
660 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
661 | +# |
662 | +############################################################################## |
663 | +{ |
664 | + "name" : "Creacion de parent_left y parent_right en analiticas", |
665 | + "version" : "1.0", |
666 | + "author" : "Vauxoo", |
667 | + "category" : "Localization/Mexico", |
668 | + "description":"""This module creates parent_left y paret_right en analytic's accounts""", |
669 | + "website" : "http://www.vauxoo.com/", |
670 | + "depends" : ["account", "project"], |
671 | + "init_xml" : [], |
672 | + "demo_xml" : [], |
673 | + "update_xml" : [], |
674 | + "installable" : True, |
675 | + "active" : False, |
676 | +} |
677 | |
678 | === added file 'account_analytic_btree/__terp__.py' |
679 | --- account_analytic_btree/__terp__.py 1970-01-01 00:00:00 +0000 |
680 | +++ account_analytic_btree/__terp__.py 2012-07-03 08:49:19 +0000 |
681 | @@ -0,0 +1,40 @@ |
682 | +# -*- encoding: utf-8 -*- |
683 | +########################################################################### |
684 | +# Module Writen to OpenERP, Open Source Management Solution |
685 | +# |
686 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
687 | +# All Rights Reserved. |
688 | +# info Vauxoo (info@vauxoo.com) |
689 | +############################################################################ |
690 | +# Coded by: Juan Carlos Hernandez Funes (info@vauxoo.com) |
691 | +# Planned by: Moises Augusto Lopez Calderon (info@vauxoo.com) |
692 | +############################################################################ |
693 | +# |
694 | +# This program is free software: you can redistribute it and/or modify |
695 | +# it under the terms of the GNU Affero General Public License as |
696 | +# published by the Free Software Foundation, either version 3 of the |
697 | +# License, or (at your option) any later version. |
698 | +# |
699 | +# This program is distributed in the hope that it will be useful, |
700 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
701 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
702 | +# GNU Affero General Public License for more details. |
703 | +# |
704 | +# You should have received a copy of the GNU Affero General Public License |
705 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
706 | +# |
707 | +############################################################################## |
708 | +{ |
709 | + "name" : "Creacion de parent_left y parent_right en analiticas", |
710 | + "version" : "1.0", |
711 | + "author" : "Vauxoo", |
712 | + "category" : "Localization/Mexico", |
713 | + "description":"""This module creates parent_left y paret_right en analytic's accounts""", |
714 | + "website" : "http://www.vauxoo.com/", |
715 | + "depends" : ["account", "project"], |
716 | + "init_xml" : [], |
717 | + "demo_xml" : [], |
718 | + "update_xml" : [], |
719 | + "installable" : True, |
720 | + "active" : False, |
721 | +} |
722 | |
723 | === added file 'account_analytic_btree/account_analytic_btree.py' |
724 | --- account_analytic_btree/account_analytic_btree.py 1970-01-01 00:00:00 +0000 |
725 | +++ account_analytic_btree/account_analytic_btree.py 2012-07-03 08:49:19 +0000 |
726 | @@ -0,0 +1,41 @@ |
727 | +# -*- encoding: utf-8 -*- |
728 | +########################################################################### |
729 | +# Module Writen to OpenERP, Open Source Management Solution |
730 | +# |
731 | +# Copyright (c) 2011 Vauxoo - http://www.vauxoo.com/ |
732 | +# All Rights Reserved. |
733 | +# info Vauxoo (info@vauxoo.com) |
734 | +############################################################################ |
735 | +# Coded by: Juan Carlos Hernandez Funes (info@vauxoo.com) |
736 | +# Planned by: Moises Augusto Lopez Calderon (info@vauxoo.com) |
737 | +############################################################################ |
738 | +# |
739 | +# This program is free software: you can redistribute it and/or modify |
740 | +# it under the terms of the GNU Affero General Public License as |
741 | +# published by the Free Software Foundation, either version 3 of the |
742 | +# License, or (at your option) any later version. |
743 | +# |
744 | +# This program is distributed in the hope that it will be useful, |
745 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
746 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
747 | +# GNU Affero General Public License for more details. |
748 | +# |
749 | +# You should have received a copy of the GNU Affero General Public License |
750 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
751 | +# |
752 | +############################################################################## |
753 | +from osv import fields, osv |
754 | + |
755 | +class account_analytic_account(osv.osv): |
756 | + _inherit ='account.analytic.account' |
757 | + |
758 | + _order = "parent_left" |
759 | + _parent_order = "code" |
760 | + _parent_store = True |
761 | + |
762 | + _columns={ |
763 | + 'parent_right': fields.integer('Parent Right', select=1), |
764 | + 'parent_left': fields.integer('Parent Left', select=1), |
765 | + } |
766 | + |
767 | +account_analytic_account() |
768 | |
769 | === added directory 'account_invoice_number_v6' |
770 | === renamed directory 'account_invoice_number_v6' => 'account_invoice_number_v6.moved' |
771 | === added file 'account_invoice_number_v6/__init__.py' |
772 | --- account_invoice_number_v6/__init__.py 1970-01-01 00:00:00 +0000 |
773 | +++ account_invoice_number_v6/__init__.py 2012-07-03 08:49:19 +0000 |
774 | @@ -0,0 +1,25 @@ |
775 | +# -*- encoding: utf-8 -*- |
776 | +########################################################################### |
777 | +# Module Writen to OpenERP, Open Source Management Solution |
778 | +# |
779 | +# Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/ |
780 | +# All Rights Reserved. |
781 | +# info Vauxoo (info@vauxoo.com) |
782 | +############################################################################ |
783 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
784 | +############################################################################ |
785 | +# |
786 | +# This program is free software: you can redistribute it and/or modify |
787 | +# it under the terms of the GNU Affero General Public License as |
788 | +# published by the Free Software Foundation, either version 3 of the |
789 | +# License, or (at your option) any later version. |
790 | +# |
791 | +# This program is distributed in the hope that it will be useful, |
792 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
793 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
794 | +# GNU Affero General Public License for more details. |
795 | +# |
796 | +# You should have received a copy of the GNU Affero General Public License |
797 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
798 | +# |
799 | +############################################################################## |
800 | |
801 | === added file 'account_invoice_number_v6/__openerp__.py' |
802 | --- account_invoice_number_v6/__openerp__.py 1970-01-01 00:00:00 +0000 |
803 | +++ account_invoice_number_v6/__openerp__.py 2012-07-03 08:49:19 +0000 |
804 | @@ -0,0 +1,45 @@ |
805 | +# -*- encoding: utf-8 -*- |
806 | +########################################################################### |
807 | +# Module Writen to OpenERP, Open Source Management Solution |
808 | +# |
809 | +# Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/ |
810 | +# All Rights Reserved. |
811 | +# info Vauxoo (info@vauxoo.com) |
812 | +############################################################################ |
813 | +# Coded by: moylop260 (moylop260@vauxoo.com) |
814 | +############################################################################ |
815 | +# |
816 | +# This program is free software: you can redistribute it and/or modify |
817 | +# it under the terms of the GNU Affero General Public License as |
818 | +# published by the Free Software Foundation, either version 3 of the |
819 | +# License, or (at your option) any later version. |
820 | +# |
821 | +# This program is distributed in the hope that it will be useful, |
822 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
823 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
824 | +# GNU Affero General Public License for more details. |
825 | +# |
826 | +# You should have received a copy of the GNU Affero General Public License |
827 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
828 | +# |
829 | +############################################################################## |
830 | + |
831 | +{ |
832 | + "name" : "Invoice number OpenERP6", |
833 | + "version" : "1.0", |
834 | + "author" : "Vauxoo", |
835 | + "category" : "Localization/Mexico", |
836 | + "description" : """This module add field internal_number to invoice view. |
837 | +when you cancel a customer invoice will not delete the invoice number |
838 | + """, |
839 | + "website" : "http://www.vauxoo.com/", |
840 | + "license" : "AGPL-3", |
841 | + "depends" : ["account"], |
842 | + "init_xml" : [], |
843 | + "demo_xml" : [], |
844 | + "update_xml" : [ |
845 | + "account_invoice_view.xml", |
846 | + ], |
847 | + "installable" : True, |
848 | + "active" : False, |
849 | +} |
850 | |
851 | === added file 'account_invoice_number_v6/account_invoice_view.xml' |
852 | --- account_invoice_number_v6/account_invoice_view.xml 1970-01-01 00:00:00 +0000 |
853 | +++ account_invoice_number_v6/account_invoice_view.xml 2012-07-03 08:49:19 +0000 |
854 | @@ -0,0 +1,55 @@ |
855 | +<?xml version="1.0"?> |
856 | +<openerp> |
857 | + <data> |
858 | + |
859 | + <record model="ir.ui.view" id="account_invoice_form_inh_numberv6_01"> |
860 | + <field name="name">account.invoice.form.inh.numberv6.01</field> |
861 | + <field name="model">account.invoice</field> |
862 | + <field name="inherit_id" ref="account.invoice_form"/> |
863 | + <field name="type">form</field> |
864 | + <field name="arch" type="xml"> |
865 | + <xpath expr="/form/group/field[@name='number']" position="replace"> |
866 | + <field name="internal_number"/> |
867 | + </xpath> |
868 | + </field> |
869 | + </record> |
870 | + <!-- |
871 | + <record model="ir.ui.view" id="account_supplier_invoice_form_inh_numberv6_01"> |
872 | + <field name="name">account.supplier.invoice.form.inh.numberv6.01</field> |
873 | + <field name="model">account.invoice</field> |
874 | + <field name="inherit_id" ref="account.invoice_supplier_form"/> |
875 | + <field name="type">form</field> |
876 | + <field name="arch" type="xml"> |
877 | + <xpath expr="/form/group/field[@name='number']" position="replace"> |
878 | + <field name="internal_number"/> |
879 | + </xpath> |
880 | + </field> |
881 | + </record> |
882 | + --> |
883 | + |
884 | + <record model="ir.ui.view" id="account_invoice_search_inh_numberv6_01"> |
885 | + <field name="name">account.invoice.form.search.inh.numberv6.01</field> |
886 | + <field name="model">account.invoice</field> |
887 | + <field name="inherit_id" ref="account.view_account_invoice_filter"/> |
888 | + <field name="type">search</field> |
889 | + <field name="arch" type="xml"> |
890 | + <xpath expr="/search/group/field[@name='number']" position="replace"> |
891 | + <field name="internal_number"/> |
892 | + </xpath> |
893 | + </field> |
894 | + </record> |
895 | + |
896 | + <record model="ir.ui.view" id="account_invoice_tree_inh_numberv6_01"> |
897 | + <field name="name">account.invoice.form.tree.inh.numberv6.01</field> |
898 | + <field name="model">account.invoice</field> |
899 | + <field name="inherit_id" ref="account.invoice_tree"/> |
900 | + <field name="type">tree</field> |
901 | + <field name="arch" type="xml"> |
902 | + <xpath expr="/tree/field[@name='number']" position="replace"> |
903 | + <field name="internal_number"/> |
904 | + </xpath> |
905 | + </field> |
906 | + </record> |
907 | + |
908 | + </data> |
909 | +</openerp> |
910 | |
911 | === added file 'account_invoice_number_v6/update_internal_number.sql' |
912 | --- account_invoice_number_v6/update_internal_number.sql 1970-01-01 00:00:00 +0000 |
913 | +++ account_invoice_number_v6/update_internal_number.sql 2012-07-03 08:49:19 +0000 |
914 | @@ -0,0 +1,51 @@ |
915 | +--Fix invoice number |
916 | +UPDATE account_invoice |
917 | +SET internal_number = inv2.number |
918 | +FROM account_invoice inv2 |
919 | +WHERE account_invoice.internal_number IS NULL |
920 | + AND inv2.number IS NOT NULL |
921 | + AND inv2.id = account_invoice.id |
922 | +; |
923 | + |
924 | +UPDATE account_invoice |
925 | +SET number = inv2.internal_number |
926 | +FROM account_invoice inv2 |
927 | +WHERE inv2.internal_number IS NOT NULL |
928 | + AND account_invoice.number IS NULL |
929 | + AND inv2.id = account_invoice.id |
930 | +; |
931 | + |
932 | +--Recovery invoice number when state is cancel |
933 | +SELECT account_invoice.id AS invoice_id, ir_attachment.name--account_invoice.number, account_invoice.internal_number |
934 | +FROM account_invoice |
935 | +LEFT OUTER JOIN ir_attachment |
936 | + ON ir_attachment.res_model = 'account.invoice' |
937 | + AND ir_attachment.res_id = account_invoice.id |
938 | +WHERE account_invoice.state = 'cancel' |
939 | + AND (internal_number IS NULL |
940 | + OR number IS NULL) |
941 | +AND ir_attachment.name ILIKE '%.xml%' |
942 | +; |
943 | + |
944 | +SELECT * |
945 | +FROM ir_attachment |
946 | +WHERE res_model = 'account.invoice' |
947 | +and |
948 | + |
949 | +WHERE account_invoice.internal_number IS NULL |
950 | + AND account_invoice.number IS NOT NULL |
951 | + AND account_invoice.id = account_invoice.id |
952 | + |
953 | + |
954 | + |
955 | + |
956 | +SELECT account_invoice.id AS invoice_id, ir_attachment.name--account_invoice.number, account_invoice.internal_number |
957 | +FROM account_invoice |
958 | +LEFT OUTER JOIN ir_attachment |
959 | + ON ir_attachment.res_model = 'account.invoice' |
960 | + AND ir_attachment.res_id = account_invoice.id |
961 | +WHERE account_invoice.state = 'cancel' |
962 | + AND (internal_number IS NULL |
963 | + OR number IS NULL) |
964 | +AND ir_attachment.name ILIKE '%.xml%' |
965 | +; |
966 | |
967 | === added file 'base_vat_mx/RFC_bugs.txt' |
968 | --- base_vat_mx/RFC_bugs.txt 1970-01-01 00:00:00 +0000 |
969 | +++ base_vat_mx/RFC_bugs.txt 2012-07-03 08:49:19 +0000 |
970 | @@ -0,0 +1,7 @@ |
971 | +Home Depot HDM001017AS1 |
972 | +VSPI VME041006RP6 |
973 | +Convertidora del Potosi SA de CV CPO981019638 |
974 | +Star Medica SA de CV SME001012RI2 |
975 | +Tiendas Soriana SA de CV TSO991022PB6 |
976 | +Gempsa Electro Suministros SA de CV GES841001I79 |
977 | +Computacion Administrativa y Diseño SA de CV CAD891013QP0 |
978 | |
979 | === modified file 'base_vat_mx/__init__.py' (properties changed: -x to +x) |
980 | === modified file 'base_vat_mx/__terp__.py' (properties changed: -x to +x) |
981 | === modified file 'base_vat_mx/base_vat.py' |
982 | --- base_vat_mx/base_vat.py 2012-03-17 02:43:15 +0000 |
983 | +++ base_vat_mx/base_vat.py 2012-07-03 08:49:19 +0000 |
984 | @@ -26,22 +26,100 @@ |
985 | from osv import osv |
986 | from osv import fields |
987 | from tools.translate import _ |
988 | -import re |
989 | -from tools.misc import ustr |
990 | -import datetime |
991 | - |
992 | +<<<<<<< TREE |
993 | +import re |
994 | +from tools.misc import ustr |
995 | +import datetime |
996 | + |
997 | +======= |
998 | +import re |
999 | +from tools.misc import ustr |
1000 | +import datetime |
1001 | + |
1002 | +''' |
1003 | +def conv_ascii(text): |
1004 | + """Convierte vocales accentuadas, ñ y ç a sus caracteres equivalentes ASCII""" |
1005 | + old_chars = ['á', 'é', 'Ã', 'ó', 'ú', 'à ', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö', 'ü', 'â', 'ê', 'î', \ |
1006 | + 'ô', 'û', '�', 'É', '�', 'Ú', 'Ó', 'À', 'È', 'Ì', 'Ò', 'Ù', 'Ä', 'Ë', '�', 'Ö', 'Ü', 'Â', 'Ê', 'Î', \ |
1007 | + 'Ô', 'Û', 'ñ', 'Ñ', 'ç', 'Ç', 'ª', 'º', '°', ' ' |
1008 | + ] |
1009 | + new_chars = ['a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', \ |
1010 | + 'o', 'u', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I', \ |
1011 | + 'O', 'U', 'n', 'N', 'c', 'C', 'a', 'o', 'o', ' ' |
1012 | + ] |
1013 | + for old, new in zip(old_chars, new_chars): |
1014 | + try: |
1015 | + text = text.replace(unicode(old,'UTF-8'), new) |
1016 | + except: |
1017 | + try: |
1018 | + text = text.replace(old, new) |
1019 | + except: |
1020 | + raise osv.except_osv(_('Warning !'), 'No se pudo re-codificar la cadena [%s] en la letra [%s]'%(text, old) ) |
1021 | + return text |
1022 | +''' |
1023 | +>>>>>>> MERGE-SOURCE |
1024 | class res_partner(osv.osv): |
1025 | _inherit = 'res.partner' |
1026 | |
1027 | - __check_vat_mx_re = re.compile(r"(?P<primeras>[A-Za-z\xd1\xf1&]{3,4})" \ |
1028 | - r"[ \-_]?" \ |
1029 | - r"(?P<ano>[0-9]{2})(?P<mes>[01][0-9])(?P<dia>[0-3][0-9])" \ |
1030 | - r"[ \-_]?" \ |
1031 | - r"(?P<code>[A-Za-z0-9&\xd1\xf1]{3})$") |
1032 | - |
1033 | - def check_vat_mx(self, vat): |
1034 | - ''' Mexican VAT verification |
1035 | - |
1036 | +<<<<<<< TREE |
1037 | + __check_vat_mx_re = re.compile(r"(?P<primeras>[A-Za-z\xd1\xf1&]{3,4})" \ |
1038 | + r"[ \-_]?" \ |
1039 | + r"(?P<ano>[0-9]{2})(?P<mes>[01][0-9])(?P<dia>[0-3][0-9])" \ |
1040 | + r"[ \-_]?" \ |
1041 | + r"(?P<code>[A-Za-z0-9&\xd1\xf1]{3})$") |
1042 | + |
1043 | + def check_vat_mx(self, vat): |
1044 | + ''' Mexican VAT verification |
1045 | + |
1046 | +======= |
1047 | + __check_vat_mx_re = re.compile(r"(?P<primeras>[A-Za-z\xd1\xf1&]{3,4})" \ |
1048 | + r"[ \-_]?" \ |
1049 | + r"(?P<ano>[0-9]{2})(?P<mes>[01][0-9])(?P<dia>[0-3][0-9])" \ |
1050 | + r"[ \-_]?" \ |
1051 | + r"(?P<code>[A-Za-z0-9&\xd1\xf1]{3})$") |
1052 | + |
1053 | + def check_vat_mx(self, vat): |
1054 | + ''' Mexican VAT verification |
1055 | + |
1056 | + Verificar RFC México |
1057 | + ''' |
1058 | + # we convert to 8-bit encoding, to help the regex parse only bytes |
1059 | + vat = ustr(vat).encode('iso8859-1') |
1060 | + m = self.__check_vat_mx_re.match(vat) |
1061 | + if not m: |
1062 | + #No valid format |
1063 | + return False |
1064 | + try: |
1065 | + ano = int(m.group('ano')) |
1066 | + if ano > 30: |
1067 | + ano = 1900 + ano |
1068 | + else: |
1069 | + ano = 2000 + ano |
1070 | + datetime.date(ano, int(m.group('mes')), int(m.group('dia'))) |
1071 | + except ValueError: |
1072 | + return False |
1073 | + #Valid format and valid date |
1074 | + return True |
1075 | + #check_vat = lambda *a: check_vat_mx |
1076 | + |
1077 | + def check_vat(self, cr, uid, ids, context=None): |
1078 | + return all( [ self.check_vat_mx( partner.vat ) for partner in self.browse(cr, uid, ids, context=context) ] ) |
1079 | + |
1080 | + def write(self, cr, uid, ids, vals, context=None): |
1081 | + if context is None: |
1082 | + context = {} |
1083 | + #print "vals",vals |
1084 | +# if 'vat' in vals: |
1085 | +# vals['vat'] = vals['vat'] and vals['vat'].replace('-', '').replace(' ', '').replace('.', '').replace('/','').replace('ñ','Ñ').upper() or vals['vat'] |
1086 | + #print "vals['vat']",vals['vat'] |
1087 | + #if 'active' in vals and not vals['active']: |
1088 | + #if 'type' in vals.keys(): |
1089 | + return super(res_partner, self).write(cr, uid, ids, vals, context=context) |
1090 | + |
1091 | + |
1092 | + def ____ANTERIOR2____check_vat(self, cr, uid, ids, context=None): |
1093 | + ''' |
1094 | +>>>>>>> MERGE-SOURCE |
1095 | Verificar RFC México |
1096 | ''' |
1097 | # we convert to 8-bit encoding, to help the regex parse only bytes |
1098 | @@ -63,6 +141,7 @@ |
1099 | #Valid format and valid date |
1100 | return True |
1101 | |
1102 | +<<<<<<< TREE |
1103 | def check_vat(self, cr, uid, ids, context=None): |
1104 | return all( [ self.check_vat_mx( partner.vat ) for partner in self.browse(cr, uid, ids, context=context) ] ) |
1105 | |
1106 | @@ -75,3 +154,21 @@ |
1107 | |
1108 | _constraints = [(check_vat, _(u'Error RFC es incorrecto, deberÃa ser algo como XYZA010203A01 or XYZ0102039A8'), ["vat"])] |
1109 | res_partner() |
1110 | +======= |
1111 | + def _______ANTERIOR____check_vat(self, cr, uid, ids, context=None): |
1112 | + for partner in self.browse(cr, uid, ids, context=context): |
1113 | + vat = partner.vat |
1114 | + if not vat: |
1115 | + continue |
1116 | + vat = vat.upper() |
1117 | + vat = ''.join( [x for x in vat if x.isupper() or x.isdigit() ] ) #Remove all characteres what no is digit or letter |
1118 | + if len(vat)==12: |
1119 | + vat = "X" + vat#Add a valid char, for pass validation with case with cad of len = 12 |
1120 | + if len(vat) <> 13 or not( vat[:4].isupper() |
1121 | + and vat[4:10].isdigit() and vat[10:13].isalnum() ): |
1122 | + return False |
1123 | + return True |
1124 | + |
1125 | + _constraints = [(check_vat, _('Error RFC es incorrecto, deberÃa ser algo como XYZA010203A01 or XYZ0102039A8'), ["vat"])] |
1126 | +res_partner() |
1127 | +>>>>>>> MERGE-SOURCE |
1128 | |
1129 | === added directory 'base_vat_mx_compatibility' |
1130 | === renamed directory 'base_vat_mx_compatibility' => 'base_vat_mx_compatibility.moved' |
1131 | === added file 'base_vat_mx_compatibility/__init__.py' |
1132 | --- base_vat_mx_compatibility/__init__.py 1970-01-01 00:00:00 +0000 |
1133 | +++ base_vat_mx_compatibility/__init__.py 2012-07-03 08:49:19 +0000 |
1134 | @@ -0,0 +1,4 @@ |
1135 | +# -*- coding: utf-8 -*- |
1136 | +import base_vat |
1137 | + |
1138 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1139 | |
1140 | === added file 'base_vat_mx_compatibility/__openerp__.py' |
1141 | --- base_vat_mx_compatibility/__openerp__.py 1970-01-01 00:00:00 +0000 |
1142 | +++ base_vat_mx_compatibility/__openerp__.py 2012-07-03 08:49:19 +0000 |
1143 | @@ -0,0 +1,17 @@ |
1144 | +# -*- coding: utf-8 -*- |
1145 | +{ |
1146 | + 'name': 'VAT Number Validation for Mexico', |
1147 | + 'version': '1.0', |
1148 | + "category": 'Hidden/Dependency', |
1149 | + 'description': """Add validation of VAT Number for Mexico prefix MX""", |
1150 | + 'author': 'Vauxoo', |
1151 | + 'depends': ['base_vat'], |
1152 | + 'website': 'http://www.vauxoo.com', |
1153 | + 'data': [], |
1154 | + 'installable': True, |
1155 | + 'auto_install': False, |
1156 | + 'certificate': '', |
1157 | + 'images': [], |
1158 | +} |
1159 | + |
1160 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1161 | |
1162 | === added file 'base_vat_mx_compatibility/base_vat.py' |
1163 | --- base_vat_mx_compatibility/base_vat.py 1970-01-01 00:00:00 +0000 |
1164 | +++ base_vat_mx_compatibility/base_vat.py 2012-07-03 08:49:19 +0000 |
1165 | @@ -0,0 +1,48 @@ |
1166 | +# -*- coding: utf-8 -*- |
1167 | +import datetime |
1168 | +import re |
1169 | + |
1170 | +from osv import osv, fields |
1171 | +from tools.misc import ustr |
1172 | +from tools.translate import _ |
1173 | + |
1174 | +_ref_vat = { |
1175 | + 'mx': 'MXABC123456T1B', |
1176 | +} |
1177 | + |
1178 | +class res_partner(osv.osv): |
1179 | + _inherit = 'res.partner' |
1180 | + |
1181 | + # Mexican VAT verification, contributed by <moylop260@vauxoo.com> |
1182 | + # and Panos Christeas <p_christ@hol.gr> |
1183 | + __check_vat_mx_re = re.compile(r"(?P<primeras>[A-Za-z\xd1\xf1&]{3,4})" \ |
1184 | + r"[ \-_]?" \ |
1185 | + r"(?P<ano>[0-9]{2})(?P<mes>[01][0-9])(?P<dia>[0-3][0-9])" \ |
1186 | + r"[ \-_]?" \ |
1187 | + r"(?P<code>[A-Za-z0-9&\xd1\xf1]{3})$") |
1188 | + def check_vat_mx(self, vat): |
1189 | + ''' Mexican VAT verification |
1190 | + |
1191 | + Verificar RFC México |
1192 | + ''' |
1193 | + # we convert to 8-bit encoding, to help the regex parse only bytes |
1194 | + vat = ustr(vat).encode('iso8859-1') |
1195 | + m = self.__check_vat_mx_re.match(vat) |
1196 | + if not m: |
1197 | + #No valid format |
1198 | + return False |
1199 | + try: |
1200 | + ano = int(m.group('ano')) |
1201 | + if ano > 30: |
1202 | + ano = 1900 + ano |
1203 | + else: |
1204 | + ano = 2000 + ano |
1205 | + datetime.date(ano, int(m.group('mes')), int(m.group('dia'))) |
1206 | + except ValueError: |
1207 | + return False |
1208 | + |
1209 | + #Valid format and valid date |
1210 | + return True |
1211 | +res_partner() |
1212 | + |
1213 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1214 | |
1215 | === added directory 'base_vat_split' |
1216 | === renamed directory 'base_vat_split' => 'base_vat_split.moved' |
1217 | === added file 'base_vat_split/__init__.py' |
1218 | --- base_vat_split/__init__.py 1970-01-01 00:00:00 +0000 |
1219 | +++ base_vat_split/__init__.py 2012-07-03 08:49:19 +0000 |
1220 | @@ -0,0 +1,4 @@ |
1221 | +# -*- coding: utf-8 -*- |
1222 | +import base_vat |
1223 | + |
1224 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1225 | |
1226 | === added file 'base_vat_split/__openerp__.py' |
1227 | --- base_vat_split/__openerp__.py 1970-01-01 00:00:00 +0000 |
1228 | +++ base_vat_split/__openerp__.py 2012-07-03 08:49:19 +0000 |
1229 | @@ -0,0 +1,17 @@ |
1230 | +# -*- coding: utf-8 -*- |
1231 | +{ |
1232 | + 'name': 'VAT Number Split', |
1233 | + 'version': '1.0', |
1234 | + "category": 'Hidden/Dependency', |
1235 | + 'description': """Split VAT Number to l10n-VAT in a new field calculated. |
1236 | + """, |
1237 | + 'author': 'Vauxoo', |
1238 | + 'depends': ['base_vat'], |
1239 | + 'website': 'http://www.vauxoo.com', |
1240 | + 'data': [], |
1241 | + 'installable': True, |
1242 | + 'auto_install': False, |
1243 | + 'certificate': '', |
1244 | +} |
1245 | + |
1246 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1247 | |
1248 | === added file 'base_vat_split/base_vat.py' |
1249 | --- base_vat_split/base_vat.py 1970-01-01 00:00:00 +0000 |
1250 | +++ base_vat_split/base_vat.py 2012-07-03 08:49:19 +0000 |
1251 | @@ -0,0 +1,21 @@ |
1252 | +# -*- coding: utf-8 -*- |
1253 | +from osv import osv, fields |
1254 | +from tools.translate import _ |
1255 | + |
1256 | +class res_partner(osv.osv): |
1257 | + _inherit = 'res.partner' |
1258 | + |
1259 | + def _get_base_vat_split(self, cr, uid, ids, field_names=None, arg=False, context={}): |
1260 | + if not context: |
1261 | + context = {} |
1262 | + res = {} |
1263 | + for partner in self.browse(cr, uid, ids, context=context): |
1264 | + res[partner.id] = partner.vat and partner.vat[2:] or False |
1265 | + return res |
1266 | + |
1267 | + _columns = { |
1268 | + 'vat_split': fields.function(_get_base_vat_split, method=True, type='char', size=64, string='VAT Split', store=True), |
1269 | + } |
1270 | +res_partner() |
1271 | + |
1272 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1273 | |
1274 | === added directory 'curp_mx' |
1275 | === added file 'curp_mx/__init__.py' |
1276 | --- curp_mx/__init__.py 1970-01-01 00:00:00 +0000 |
1277 | +++ curp_mx/__init__.py 2012-07-03 08:49:19 +0000 |
1278 | @@ -0,0 +1,27 @@ |
1279 | +# -*- encoding: utf-8 -*- |
1280 | +########################################################################### |
1281 | +# Module Writen to OpenERP, Open Source Management Solution |
1282 | +# |
1283 | +# Copyright (c) 2011 Echeverrifm - http://echeverrifm.com.ar |
1284 | +# All Rights Reserved. |
1285 | +# info echeverrifm (echeverrifm@gmail.com) |
1286 | +############################################################################ |
1287 | +# Coded by: echeverrifm (echeverrifm@gmail.com) |
1288 | +############################################################################ |
1289 | +# |
1290 | +# This program is free software: you can redistribute it and/or modify |
1291 | +# it under the terms of the GNU Affero General Public License as |
1292 | +# published by the Free Software Foundation, either version 3 of the |
1293 | +# License, or (at your option) any later version. |
1294 | +# |
1295 | +# This program is distributed in the hope that it will be useful, |
1296 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1297 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1298 | +# GNU Affero General Public License for more details. |
1299 | +# |
1300 | +# You should have received a copy of the GNU Affero General Public License |
1301 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1302 | +# |
1303 | +############################################################################## |
1304 | + |
1305 | +import curp_mx |
1306 | |
1307 | === added file 'curp_mx/__openerp__.py' |
1308 | --- curp_mx/__openerp__.py 1970-01-01 00:00:00 +0000 |
1309 | +++ curp_mx/__openerp__.py 2012-07-03 08:49:19 +0000 |
1310 | @@ -0,0 +1,43 @@ |
1311 | +# -*- encoding: utf-8 -*- |
1312 | +########################################################################### |
1313 | +# Module Writen to OpenERP, Open Source Management Solution |
1314 | +# |
1315 | +# Copyright (c) 2011 Echeverrifm - http://echeverrifm.com.ar |
1316 | +# All Rights Reserved. |
1317 | +# info echeverrifm (echeverrifm@gmail.com) |
1318 | +############################################################################ |
1319 | +# Coded by: echeverrifm (echeverrifm@gmail.com) |
1320 | +############################################################################ |
1321 | +# |
1322 | +# This program is free software: you can redistribute it and/or modify |
1323 | +# it under the terms of the GNU Affero General Public License as |
1324 | +# published by the Free Software Foundation, either version 3 of the |
1325 | +# License, or (at your option) any later version. |
1326 | +# |
1327 | +# This program is distributed in the hope that it will be useful, |
1328 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1329 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1330 | +# GNU Affero General Public License for more details. |
1331 | +# |
1332 | +# You should have received a copy of the GNU Affero General Public License |
1333 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1334 | +# |
1335 | +############################################################################## |
1336 | + |
1337 | +{ |
1338 | + "name" : "Validation for the CURP of Mexico", |
1339 | + "version" : "1.0", |
1340 | + "author" : "echeverrifm@gmail.com", |
1341 | + "category" : "Localization/Mexican", |
1342 | + "description" : """Add validation for the CURP of Mexico. |
1343 | +And Remove the problem, for capture CURP of Mexico. |
1344 | + """, |
1345 | + "website" : "http://echeverrifm.com.ar", |
1346 | + "license" : "AGPL-3", |
1347 | + "depends" : ["base"], |
1348 | + "init_xml" : [], |
1349 | + "demo_xml" : [], |
1350 | + "update_xml" : ['curp_mx_view.xml',], |
1351 | + "installable" : True, |
1352 | + "active" : False, |
1353 | +} |
1354 | |
1355 | === added file 'curp_mx/curp_mx.py' |
1356 | --- curp_mx/curp_mx.py 1970-01-01 00:00:00 +0000 |
1357 | +++ curp_mx/curp_mx.py 2012-07-03 08:49:19 +0000 |
1358 | @@ -0,0 +1,39 @@ |
1359 | +# -*- encoding: utf-8 -*- |
1360 | +########################################################################### |
1361 | +# Module Writen to OpenERP, Open Source Management Solution |
1362 | +# |
1363 | +# Copyright (c) 2011 Echeverrifm - http://echeverrifm.com.ar |
1364 | +# All Rights Reserved. |
1365 | +# info echeverrifm (echeverrifm@gmail.com) |
1366 | +############################################################################ |
1367 | +# Coded by: echeverrifm (echeverrifm@gmail.com) |
1368 | +############################################################################ |
1369 | +# |
1370 | +# This program is free software: you can redistribute it and/or modify |
1371 | +# it under the terms of the GNU Affero General Public License as |
1372 | +# published by the Free Software Foundation, either version 3 of the |
1373 | +# License, or (at your option) any later version. |
1374 | +# |
1375 | +# This program is distributed in the hope that it will be useful, |
1376 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1377 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1378 | +# GNU Affero General Public License for more details. |
1379 | +# |
1380 | +# You should have received a copy of the GNU Affero General Public License |
1381 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1382 | +# |
1383 | +############################################################################## |
1384 | +from osv import osv |
1385 | +from osv import fields |
1386 | +from tools.translate import _ |
1387 | + |
1388 | + |
1389 | +class res_partner(osv.osv): |
1390 | + _inherit = 'res.partner' |
1391 | + |
1392 | + _columns = { |
1393 | + 'curp': fields.char('CURP', size=64, select=1), |
1394 | + } |
1395 | + |
1396 | + |
1397 | +res_partner() |
1398 | |
1399 | === added file 'curp_mx/curp_mx_view.xml' |
1400 | --- curp_mx/curp_mx_view.xml 1970-01-01 00:00:00 +0000 |
1401 | +++ curp_mx/curp_mx_view.xml 2012-07-03 08:49:19 +0000 |
1402 | @@ -0,0 +1,20 @@ |
1403 | +<?xml version="1.0"?> |
1404 | +<openerp> |
1405 | + <data> |
1406 | + |
1407 | + |
1408 | + <record id="view_partner_diot_form" model="ir.ui.view"> |
1409 | + <field name="name">res.partner.form.diot</field> |
1410 | + <field name="model">res.partner</field> |
1411 | + <field name="inherit_id" ref="base.view_partner_form"/> |
1412 | + <field name="arch" type="xml"> |
1413 | + <field name="vat" position="before"> |
1414 | + <field name="curp" groups="base.group_extended"/> |
1415 | + <newline/> |
1416 | + </field> |
1417 | + </field> |
1418 | + </record> |
1419 | + |
1420 | + |
1421 | + </data> |
1422 | +</openerp> |
1423 | |
1424 | === added directory 'diot_mx' |
1425 | === added file 'diot_mx/__init__.py' |
1426 | --- diot_mx/__init__.py 1970-01-01 00:00:00 +0000 |
1427 | +++ diot_mx/__init__.py 2012-07-03 08:49:19 +0000 |
1428 | @@ -0,0 +1,28 @@ |
1429 | +# -*- encoding: utf-8 -*- |
1430 | +########################################################################### |
1431 | +# Module Writen to OpenERP, Open Source Management Solution |
1432 | +# |
1433 | +# Copyright (c) 2011 Echeverrifm - http://www.echeverrifm.com.ar |
1434 | +# All Rights Reserved. |
1435 | +# info echeverrifm (echeverrifm@gmail.com) |
1436 | +############################################################################ |
1437 | +# Coded by: echeverrifm (echeverrifm@gmail.com) |
1438 | +# Launchpad Project Manager for Publication: Nhomar Hernandez - nhomar@openerp.com.ve |
1439 | +############################################################################ |
1440 | +# |
1441 | +# This program is free software: you can redistribute it and/or modify |
1442 | +# it under the terms of the GNU Affero General Public License as |
1443 | +# published by the Free Software Foundation, either version 3 of the |
1444 | +# License, or (at your option) any later version. |
1445 | +# |
1446 | +# This program is distributed in the hope that it will be useful, |
1447 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1448 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1449 | +# GNU Affero General Public License for more details. |
1450 | +# |
1451 | +# You should have received a copy of the GNU Affero General Public License |
1452 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1453 | +# |
1454 | +############################################################################## |
1455 | +import wizard |
1456 | +import partner |
1457 | |
1458 | === added file 'diot_mx/__openerp__.py' |
1459 | --- diot_mx/__openerp__.py 1970-01-01 00:00:00 +0000 |
1460 | +++ diot_mx/__openerp__.py 2012-07-03 08:49:19 +0000 |
1461 | @@ -0,0 +1,45 @@ |
1462 | +# -*- encoding: utf-8 -*- |
1463 | +########################################################################### |
1464 | +# Module Writen to OpenERP, Open Source Management Solution |
1465 | +# |
1466 | +# Copyright (c) 2011 Echeverrifm - http://www.echeverrifm.com.ar |
1467 | +# All Rights Reserved. |
1468 | +# info echeverrifm (echeverrifm@gmail.com) |
1469 | +############################################################################ |
1470 | +# Coded by: echeverrifm (echeverrifm@gmail.com) |
1471 | +# Launchpad Project Manager for Publication: Nhomar Hernandez - nhomar@openerp.com.ve |
1472 | +############################################################################ |
1473 | +# |
1474 | +# This program is free software: you can redistribute it and/or modify |
1475 | +# it under the terms of the GNU Affero General Public License as |
1476 | +# published by the Free Software Foundation, either version 3 of the |
1477 | +# License, or (at your option) any later version. |
1478 | +# |
1479 | +# This program is distributed in the hope that it will be useful, |
1480 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1481 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1482 | +# GNU Affero General Public License for more details. |
1483 | +# |
1484 | +# You should have received a copy of the GNU Affero General Public License |
1485 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1486 | +# |
1487 | +############################################################################## |
1488 | + |
1489 | +{ |
1490 | + "name" : "Declaracion de IVA para mexico", |
1491 | + "version" : "1.0", |
1492 | + "depends" : ["base", "base_vat","account" ], |
1493 | + "author" : "Federico Manuel Echeverri Choux", |
1494 | + "description": """Modulo para la declaracion de Impuesto al valor Agregado en Mexico: |
1495 | + """, |
1496 | + 'author': 'Federico Manuel Echeverri Choux', |
1497 | + "website" : "http://www.echeverrifm.com.ar/", |
1498 | + 'init_xml': [], |
1499 | + 'update_xml': [ |
1500 | + #"wizard_diot_report.xml", |
1501 | + "partner_view.xml", |
1502 | + 'wizard/account_diot_mx_report_view.xml', |
1503 | + ], |
1504 | + 'installable': True, |
1505 | + 'active': False, |
1506 | +} |
1507 | |
1508 | === added directory 'diot_mx/doc' |
1509 | === added file 'diot_mx/doc/Imprimiendo _LayOut DIOT Completa 2010 SAT_.pdf' |
1510 | Binary files diot_mx/doc/Imprimiendo _LayOut DIOT Completa 2010 SAT_.pdf 1970-01-01 00:00:00 +0000 and diot_mx/doc/Imprimiendo _LayOut DIOT Completa 2010 SAT_.pdf 2012-07-03 08:49:19 +0000 differ |
1511 | === added file 'diot_mx/doc/lfa29s.pdf' |
1512 | Binary files diot_mx/doc/lfa29s.pdf 1970-01-01 00:00:00 +0000 and diot_mx/doc/lfa29s.pdf 2012-07-03 08:49:19 +0000 differ |
1513 | === added file 'diot_mx/doc/pyr_frecuentesdiot_1_01072010.pdf' |
1514 | --- diot_mx/doc/pyr_frecuentesdiot_1_01072010.pdf 1970-01-01 00:00:00 +0000 |
1515 | +++ diot_mx/doc/pyr_frecuentesdiot_1_01072010.pdf 2012-07-03 08:49:19 +0000 |
1516 | @@ -0,0 +1,1980 @@ |
1517 | +%PDF-1.5 |
1518 | +%µµµµ |
1519 | +1 0 obj |
1520 | +<</Type/Catalog/Pages 2 0 R/Lang(es-MX) /StructTreeRoot 59 0 R/MarkInfo<</Marked true>>>> |
1521 | +endobj |
1522 | +2 0 obj |
1523 | +<</Type/Pages/Count 9/Kids[ 3 0 R 24 0 R 32 0 R 39 0 R 41 0 R 48 0 R 50 0 R 52 0 R 54 0 R] >> |
1524 | +endobj |
1525 | +3 0 obj |
1526 | +<</Type/Page/Parent 2 0 R/Resources<</XObject<</Image5 5 0 R>>/Font<</F1 6 0 R/F2 8 0 R/F3 13 0 R/F4 18 0 R/F5 20 0 R/F6 22 0 R>>/ProcSet[/PDF/Text/ImageB/ImageC/ImageI] >>/MediaBox[ 0 0 792 612] /Contents 4 0 R/Group<</Type/Group/S/Transparency/CS/DeviceRGB>>/Tabs/S/StructParents 0>> |
1527 | +endobj |
1528 | +4 0 obj |
1529 | +<</Filter/FlateDecode/Length 3478>> |
1530 | +stream |
1531 | +xœÍ[Ks |
1532 | ·¾³ŠÿÇ |
1533 | |
1534 | <æåR1E‹¢³))’¥-å û0œ |
1535 | Ò›âî¬öAGùsþ-<æ “o>¥»Ìcw1ÊI%åw@7ÐO| |
1536 | ŒÏ/×Ûùm^lÙ³gç—Ûm^ü\Î؇óiµúé|úiUž¿ÉïæË|;¯–컫çìãé‰HBž±þSO˜ŠY¤bh)§'ç“E~WFìªb?œž|7…–kÁ„à¡fÓ[ %:ÁdˆH—Æl |
1537 | +„!»Ã?ߟž|±à'6ýËéÉ‹©aáˆp&óØPô�š‡ÇƱ¯ž³s�ÜßUÛmµð‰î¤I÷…QiÂÈÅ1W©6ÒpIòÀÏ�DQÎqÈ…dI&ñ'ô³.OOþö |
1538 | [Ze(Í£˜Å’g0]jž¥,ä‰ |
1539 | CECo¿9=ù¡+¸H�QÊ¢ˆ'¡¶Â¿ |
1540 | ÆzTz´¢ÑC�ŒæE0NGóŠc5šØ)2Xá8]âؾ.æø¸„Þy ÔhŒãч — |
1541 | š |
1542 | äôÛ2ˆ |
1543 | åt�Cov� |
1544 | –# |
1545 | ;Ï}F¡#Õ]ë¾AϯåmƒiSÑ&µ„"bÓâóPè$ |
1546 | ]ì3:f6)�nŸ‘Jr]>ø®WÉ>™Ö‘q¯SªˆgªKF�Íg9ü½¿«)Fg^·Ž¸ýkÆ& |
1547 | VÔ‹Öü�ŒËÁx^JpfÝÕÊÕJZm’ø貘Ëìˆ|^q²”GÉ0qtž¿ç,úd2Ý£‡rô:/¹ˆ´ñ=úª‰ |
1548 | ’«º ©|\tÂÕžþÏÌ´ðÇD¬¦¼Æ&D`�y;hÇ>üýþQ°ü‹ŒRAÚâ÷*Òôü#�ÒF-ŠÛ |
1549 | ¹†¼~»„6¯gAæUE”Abü‚ÖϯÕa´H©¹brœ¶tÏÂPÇã~…¸ÈžQÜ�#ø�Ô…6ôêš…mÎÌOl~”û-Oc™(tØöÊFÓòž"ôjA¦†~‡f‚ªû+¨ôúu bÈ›@O qú-†T |
1550 | ‚úü£—mƒ-¡kÑð»Õ~IàAÂ¿Ô |
1551 | á� |
1552 | ƒ¬¢`� êšÅ)�L£Òo$éÇ,J�º#¨Sød¸ÄPv¬á˜èçÐ |
1553 | ÒÆÆ–/ÐŽÐÀT_#_êªy¤n¤m |
1554 | `[� .öôò |
1555 | æÈ_ÀNô@OÛSîà |
1556 | £å&À €ð |
1557 | +Æ"�PòD…Îxœôë¿ |
1558 | žEÃÆ&0àŠJ8„ÏÎ^ª˜‹6ÑÃÎß xyõ|rÅÂó—ùòŽ�ÊÍøÅ» ƒVô1ì@EG |
1559 | ¬Äciù¿�¼·.ïv°1,Ñç·¨Í |
1560 | >1èùÄàí-àaÚV˜jv˜27"h0Ž»]Ø(0!ï |
1561 | î€$f6ÔÞ,�‚²Tw]?Ž¼ƒ“ƒÁW°ŒÉkXÇÔg:AfîÎøˈG{jê5ƒð›!bÏânäÆ CÊÅ |
1562 | Ë> |
1563 | e� Úhvo€G1mÆ‹O"1m:³{ÿúÌ9pŸCN\–nhï |
1564 | íIKJq÷´sŽÑÈ |
1565 | ¼È<Þ`ë |
1566 | ‡ß!À™QcEdŒ€¤e´Zc2NFårKóäè’� |
1567 | +ÐÈDxD£¯ _‚›Ýãp3 |
1568 | ¨ñ¡€¹²l¹cJþ$uD±øv[!D]�08t;À±†'0Ÿ•øŠ4¯ÉÅ˵›²¨PV°Nmˆ |
1569 | + |
1570 | vãë؇+.�6kÉù£]2®†¸O]dIÒH(Â3â÷ |
1571 | š¸à4XpÉÁ9±ÿO¾D!¡kí |
1572 | n¤žì¡±âI:„µö±ns3ÙÐp{™“WÆ–à |
1573 | ¤ïM{íÒTرñ¹«#�´Ãòö³¡™“Ò |
1574 | +3Á'ü³0ŽØú |
1575 | GÄ4)ð�G1‰íhƒ( |
1576 | XK- ŒÝXd ˆ®„�„VÇòÂl7 |
1577 | +=Ýò¡§V�!z˜“ÿÌ°%ŸO±wØF+zÀ |
1578 | ·˜jÞ8€Ý“h9{I0sls2™uÞÓ\l‚™ù=Á’üœTÆÉÓZRCà )GF |
1579 | ZI¾4ñèIIÆEÖÕ8Ù¬t’y7[’ˆ$ÍiÝÀ™Ô±? ¹gµáYù☆�YQÔ |
1580 | ¿¹µö”ýZe<rõvnÜ¡hÌÈ |
1581 | +2“qƒzñã„•›`ÖƒÝÔF¥ÕæF¤FÕà6Ü祩 |
1582 | ßYVoECÂHB |
1583 | 2„Yì÷øx¸C�$\¸_ci|¥QJ¾pjh”BÎõ²åš´Gßbï!Š=’i„ŠyÒ�ýr½ýL¾[ìîIÅ4�’˜0¤9Y - ×B’]=’QÖ.ÂÉ ·Õ¹à÷Ÿ(·ßvz |
1584 | ôä¶<yeí÷>°»°÷”9&“ •-§m†Mܘ°3‰œ¢Óú;[I$®‘v |
1585 | ¢ã€3hŽ3+n8Ø.Óå+uÚ®½>és¿X@‰�vë‹žXÒÙQg,H�ÂíM§h)lV¶ò’oƒ |
1586 | +‚§A |
1587 | H £‹¡Cåz‹Ê}uM>·Êko0¶îK¡â¡ |
1588 | '¢ ýe+r~—˜¤ÛòYŽo¬t;=Ùü{õ |
1589 | Ⱥ߶B 3Ã6JÜìï;Ô*‘6î‡êôÔª‘â©ì®Ó[×F˜ZCñhJbê)P8ú<E¦1 |
1590 | ju(‰¨7Á$²–¶É t’>äª$E8?€u6d¡PÞ·ŽÀ1€_Öh±†r+‚‰ˆò ª@Û2§!¯Á–•£Z#‹i‘²¨(y®(Œ��ŒËٜҫãƒ'°åyl׫Asyo¶>®Û |
1591 | ®¡ÜèRÒæ[@kÁ³ÅÚ/ËO5•sï00Ò¿{{fö7hüuF°ü¦$IÍ1WiÁIGˆ |
1592 | ž|n— |
1593 | oMmù_•Kß;ì� |
1594 | º»ƒÝ1L·ÃÈEC·õ°‡zªžÐV‘æÚ…ŒY¸ÁöF£kW>ó |
1595 | +Õ°$e�)‹ŠfZ"ÉÔ€E¬ |
1596 | Š’¦ÅU÷!MdÀ}âÀ½…÷î¹A÷þ#ãO©:bôW Þ“€¶V´D |
1597 | 7„Ý“+Z¥B<]´7Ÿ |
1598 | 6BULqÌ·¨™GB™3 |
1599 | H�ûˆÐm®×¥¹ÊVõÞm ~ |
1600 | ÏpŽî¾�¡îk“Šã=»k |
1601 | ZžíP<(Ãöª |
1602 | kÍsƒ{®{Î꣤«;¥jÍhQ)Õ(: |
1603 | ¶I n |
1604 | šÛ•,Ho¬%AŒ(wleitàæpRý“Ài£fAHe±¿%îv�+¨yš}jsÐŽÜ7[0¥L@E |
1605 | +tG|/ð€º"Üs |
1606 | œÉStWŸ÷…¿Hð Îp\9}�Š6u!GzÊ)Ô^w5y�E½ÔK@ó]îýaä=½i/ÐO:,ȽU|‹�Ì�\�¿É1yYÈÙ*©0ÚP«ƒ ã&ø6¬ |
1607 | { |
1608 | "y¤ÆUljÍ!�‹=C¶°þb]¸]p“ÿüNýmËe ÷K-„P›mæ |
1609 | m�j'܇fw`Ô}ÿ0ðoE®Ñ}·€!í4Æo€ùk$šžVUœy;{áb6®ò±Õ³½–ÚC³Â›ºþþTIGÜqÒªm$_Ô¤^wì|P…�ÀÛº¸eNv0BO¡�î“ |
1610 | +®]0» |
1611 | ×ÔT�ÄkíÖé;!¹¯ç5–(¶¾xŠ`SìNù{¦â\�NÆñáÙ £_w |
1612 | Rœÿ•G6€q‘µ/ôœNÄZAµÐQ|ærÈ'㌫a‰Ì{Øá;ŸÀò&ÌþWç�Ù}çg˜k´çpÂ¥ÃÛÊÞÚ¦Æån×æ°«»žr A¤—œ]â,$üg•Ý5ú®TbÅ垘cïØ·«ÎØï1QÒ©€ |
1613 | œç××õAd“/:§ 0K"*Ž)V ,6 ©ò-VöVöT20„ÖŠ |
1614 | +uÑŸÈ´æYÒÆ ¶¨Ïž^Óãs«Ù›Í$U{^!H |
1615 | æÀÄ[ýÃ_¨Ðq¤¿JukÙeÞbÞ#À¶Ž”äé0$3¤à—’¾ÕÂîÉ¿ |
1616 | Sü�ÃðV¦F¯{QДm[ºÁ:ñfGGîN©©Æ×ñæfË–¹TžÿZPHî |
1617 | Íí³Ê^!ÝÐd6 |
1618 | MÛZ¶¾àr÷DËí±:Ù–è_S'ÿ™K./¾‚®¼$=ûn¹zÂOdt¬äîr¯&@ç» «%¨N6•3$i�FýÑ–¤{óøntE”BhvÆúnÖD¬1Ò:c½¹0ó=tû!§Q"Õ\ |
1619 | +JÙsý¼J }øf/ÍwÈû>ŒàRw |
1620 | Òi@‡•6-.J‡øæ |
1621 | È_”xÊ%è»@ÑÚ–WúîÆ€©&›OKËÎ’¼Ç¡"ÅÒ²»|[sl®ÁjÈnwh‚ |
1622 | +˜ |
1623 | V•«I |
1624 | º`$E<*~&DÌÌ |
1625 | »”`A]û>ÿÕ"Äs¯4‡ÖöžÉ´ |
1626 | |
1627 | e< |
1628 | tÄ#{¾,8ŽÁ„Nx’ü |
1629 | æ "¡ðZ±Ãý`µ?Vr#ä |
1630 | +3º¢” |
1631 | ÿ~‚’O&¸q«=,VºS•/Væ~åíqdD_5ÖWCŠB¿žOcDÔU�÷››,ÄÏh:cÛ7)¸ÊU]$·q×S.HöRÄ×_’ôì4*j>Ó©kè/"ª°Ê |
1632 | q¼ |
1633 | 9|êªA_MÈ!•° |
1634 | z¿eï°ë©¨Žª,ã¢þŠMÿ— Õ-¹ðgwV„lŠ |
1635 | Ÿ |
1636 | žÚ¯Gª¨ KEOÄRAßÅCïCÇUóÑP |
1637 | wz. "wGóņ õù�›¼:rËà»öÌ”tlÖ¾‹ðþÿ õ§„†¹’ú±Pg¾�ý7àÏ»¬ |
1638 | +endstream |
1639 | +endobj |
1640 | +5 0 obj |
1641 | +<</Type/XObject/Subtype/Image/Width 242/Height 57/ColorSpace/DeviceRGB/BitsPerComponent 8/Filter/DCTDecode/Interpolate true/Length 6665>> |
1642 | +stream |
1643 | +ÿØÿà JFIF H H ÿá |
1644 | µExif II* €ÿ b j ( ÿÿ1 |
1645 |
debemos colocar todos los wizards como osv_memory, no haremos merge de
wizards con interface.
2011/7/3 echeverrifm <email address hidden>
> echeverrifm has proposed merging openerp. com.ve (nhomar) /code.launchpad .net/~openerp- mexico/ openerp- mexico- localization/ diot_report/ +merge/ 66712 /code.launchpad .net/~openerp- mexico/ openerp- mexico- localization/ diot_report/ +merge/ 66712 __init_ _.py' ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### ## www.gnu. org/licenses/ ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### ## __openerp_ _.py' __openerp_ _.py 1970-01-01 00:00:00 +0000 __openerp_ _.py 2011-07-03 04:57:25 +0000 ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### ## www.gnu. org/licenses/
> lp:~openerp-mexico/openerp-mexico-localization/diot_report into
> lp:openerp-mexico-localization/6.0.
>
> Requested reviews:
> Nhomar (Vauxoo) - http://
>
> For more details, see:
>
> https:/
>
> Agregando modulo de Declaracion Informativa de operaciones con terceros (
> DIOT )
> --
>
> https:/
> You are requested to review the proposed merge of
> lp:~openerp-mexico/openerp-mexico-localization/diot_report into
> lp:openerp-mexico-localization/6.0.
>
> === added directory 'diot_mx'
> === added file 'diot_mx/
> --- diot_mx/__init__.py 1970-01-01 00:00:00 +0000
> +++ diot_mx/__init__.py 2011-07-03 04:57:25 +0000
> @@ -0,0 +1,21 @@
> +# -*- encoding: utf-8 -*-
>
> +######
> +#
> +# IVA for Mexico
> +# Copyright (C) 2010 Software All Rights Reserved
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation, either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program. If not, see <http://
> >.
> +#
>
> +######
> +import wizard
>
> === added file 'diot_mx/
> --- diot_mx/
> +++ diot_mx/
> @@ -0,0 +1,39 @@
> +# -*- encoding: utf-8 -*-
>
> +######
> +#
> +# Modulo de Declaracion de Impuestos al Valor Agregado
> +# Copyright (C) 2010 Software All Rights Reserved
> +#
> +# $Id$
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation, either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program. If not, see <http://
> >.
> +#
>
> +########...