[FORWARD] Forward port of 7.0 branch until revision 9143.

bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06

addons/account/account_invoice.py

@@ -722,7 +722,7 @@ class account_invoice(osv.osv):
         inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
-        company_currency = inv.company_id.currency_id.id
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         if inv.type in ('out_invoice', 'in_refund'):
             sign = 1
         else:
@@ -769,6 +769,7 @@ class account_invoice(osv.osv):
         return move_lines
 
     def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id
         if not inv.tax_line:
             for tax in compute_taxes.values():
                 ait_obj.create(cr, uid, tax)
@@ -782,7 +783,7 @@ class account_invoice(osv.osv):
                 if not key in compute_taxes:
                     raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
                 base = compute_taxes[key]['base']
-                if abs(base - tax.base) > inv.company_id.currency_id.rounding:
+                if abs(base - tax.base) > company_currency.rounding:
                     raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.'))
             for key in compute_taxes:
                 if not key in tax_key:
@@ -869,7 +870,7 @@ class account_invoice(osv.osv):
             ctx.update({'lang': inv.partner_id.lang})
             if not inv.date_invoice:
                 self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx)
-            company_currency = inv.company_id.currency_id.id
+            company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
             # create the analytical lines
             # one move line per invoice line
             iml = self._get_analytic_lines(cr, uid, inv.id, context=ctx)
@@ -985,7 +986,8 @@ class account_invoice(osv.osv):
                 'line_id': line,
                 'journal_id': journal_id,
                 'date': date,
-                'narration':inv.comment
+                'narration': inv.comment,
+                'company_id': inv.company_id.id,
             }
             period_id = inv.period_id and inv.period_id.id or False
             ctx.update(company_id=inv.company_id.id)
@@ -1517,8 +1519,7 @@ class account_invoice_line(osv.osv):
         if context is None:
             context = {}
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
-        company_currency = inv.company_id.currency_id.id
-
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         for line in inv.invoice_line:
             mres = self.move_line_get_item(cr, uid, line, context)
             if not mres:
@@ -1662,8 +1663,7 @@ class account_invoice_tax(osv.osv):
         cur_obj = self.pool.get('res.currency')
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         cur = inv.currency_id
-        company_currency = inv.company_id.currency_id.id
-
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         for line in inv.invoice_line:
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
                 val={}

addons/account/report/account_general_ledger.py

@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/account/res_config.py

@@ -25,6 +25,7 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 from os.path import join as opj
 
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 from openerp import tools
@@ -132,12 +133,43 @@ class account_config_settings(osv.osv_memory):
         count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
         return bool(count == 1)
 
+    def _get_default_fiscalyear_data(self, cr, uid, company_id, context=None):
+        """Compute default period, starting and ending date for fiscalyear
+        - if in a fiscal year, use its period, starting and ending date
+        - if past fiscal year, use its period, and new dates [ending date of the latest +1 day ; ending date of the latest +1 year]
+        - if no fiscal year, use monthly, 1st jan, 31th dec of this year
+        :return: (date_start, date_stop, period) at format DEFAULT_SERVER_DATETIME_FORMAT
+        """
+        fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+                [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
+                 ('company_id', '=', company_id)])
+        if fiscalyear_ids:
+            # is in a current fiscal year, use this one
+            fiscalyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context)
+            if len(fiscalyear.period_ids) == 5:  # 4 periods of 3 months + opening period
+                period = '3months'
+            else:
+                period = 'month'
+            return (fiscalyear.date_start, fiscalyear.date_stop, period)
+        else:
+            past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+                [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
+            if past_fiscalyear_ids:
+                # use the latest fiscal, sorted by (start_date, id)
+                latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
+                latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
+                if len(latest_year.period_ids) == 5:
+                    period = '3months'
+                else:
+                    period = 'month'
+                return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF), period)
+            else:
+                return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'), 'month')
+
+
     _defaults = {
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
-        'date_start': lambda *a: time.strftime('%Y-01-01'),
-        'date_stop': lambda *a: time.strftime('%Y-12-31'),
-        'period': 'month',
     }
 
     def create(self, cr, uid, values, context=None):
@@ -161,6 +193,7 @@ class account_config_settings(osv.osv_memory):
             fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
                 [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
                  ('company_id', '=', company_id)])
+            date_start, date_stop, period = self._get_default_fiscalyear_data(cr, uid, company_id, context=context)
             values = {
                 'expects_chart_of_accounts': company.expects_chart_of_accounts,
                 'currency_id': company.currency_id.id,
@@ -170,6 +203,9 @@ class account_config_settings(osv.osv_memory):
                 'has_fiscal_year': bool(fiscalyear_count),
                 'chart_template_id': False,
                 'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+                'date_start': date_start,
+                'date_stop': date_stop,
+                'period': period,
             }
             # update journals and sequences
             for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):

addons/account/wizard/pos_box.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _

addons/account_followup/account_followup.py

@@ -165,9 +165,8 @@ class res_partner(osv.osv):
             else:
                 action_text = partner.latest_followup_level_id_without_lit.manual_action_note or ''
 
-            #Check date: put the minimum date if it existed already
-            action_date = (partner.payment_next_action_date and min(partner.payment_next_action_date, fields.date.context_today(self, cr, uid, context=context))
-                           ) or fields.date.context_today(self, cr, uid, context=context)
+            #Check date: only change when it did not exist already
+            action_date = partner.payment_next_action_date or fields.date.context_today(self, cr, uid, context=context)
 
             # Check responsible: if partner has not got a responsible already, take from follow-up
             responsible_id = False

addons/account_test/account_test.py

@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/account_voucher/account_voucher.py

@@ -26,6 +26,7 @@ from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 from openerp.tools import float_compare
+from openerp.report import report_sxw
 
 class res_currency(osv.osv):
     _inherit = "res.currency"
@@ -238,13 +239,12 @@ class account_voucher(osv.osv):
         line_osv = self.pool.get("account.voucher.line")
         line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
         line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
-
         #compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
         is_multi_currency = False
         #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options
         for voucher_line in line_dr_ids+line_cr_ids:
-            line_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).currency_id
-            if line_currency:
+            line_id = voucher_line.get('id') and self.pool.get('account.voucher.line').browse(cr, uid, voucher_line['id'], context=context).move_line_id.id or voucher_line.get('move_line_id')
+            if line_id and self.pool.get('account.move.line').browse(cr, uid, line_id, context=context).currency_id:
                 is_multi_currency = True
                 break
         return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
@@ -285,6 +285,36 @@ class account_voucher(osv.osv):
             res[voucher.id] =  self.pool.get('res.currency').compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, voucher.amount, context=ctx)
         return res
 
+    def _get_currency_help_label(self, cr, uid, currency_id, payment_rate, payment_rate_currency_id, context=None):
+        """
+        This function builds a string to help the users to understand the behavior of the payment rate fields they can specify on the voucher. 
+        This string is only used to improve the usability in the voucher form view and has no other effect.
+
+        :param currency_id: the voucher currency
+        :type currency_id: integer
+        :param payment_rate: the value of the payment_rate field of the voucher
+        :type payment_rate: float
+        :param payment_rate_currency_id: the value of the payment_rate_currency_id field of the voucher
+        :type payment_rate_currency_id: integer
+        :return: translated string giving a tip on what's the effect of the current payment rate specified
+        :rtype: str
+        """
+        rml_parser = report_sxw.rml_parse(cr, uid, 'currency_help_label', context=context)
+        currency_pool = self.pool.get('res.currency')
+        currency_str = payment_rate_str = ''
+        if currency_id:
+            currency_str = rml_parser.formatLang(1, currency_obj=currency_pool.browse(cr, uid, currency_id, context=context))
+        if payment_rate_currency_id:
+            payment_rate_str  = rml_parser.formatLang(payment_rate, currency_obj=currency_pool.browse(cr, uid, payment_rate_currency_id, context=context))
+        currency_help_label = _('At the operation date, the exchange rate was\n%s = %s') % (currency_str, payment_rate_str)
+        return currency_help_label
+
+    def _fnct_currency_help_label(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] = self._get_currency_help_label(cr, uid, voucher.currency_id.id, voucher.payment_rate, voucher.payment_rate_currency_id.id, context=context)
+        return res
+
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _inherit = ['mail.thread']
@@ -356,6 +386,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'currency_help_label': fields.function(_fnct_currency_help_label, type='text', string="Helping Sentence", help="This sentence helps you to know how to specify the payment rate by giving you the direct effect it has"), 
     }
     _defaults = {
         'active': True,
@@ -528,7 +559,7 @@ class account_voucher(osv.osv):
         return default
 
     def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
-        res =  {'value': {'paid_amount_in_company_currency': amount}}
+        res =  {'value': {'paid_amount_in_company_currency': amount, 'currency_help_label': self._get_currency_help_label(cr, uid, currency_id, rate, payment_rate_currency_id, context=context)}}
         if rate and amount and currency_id:
             company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
             #context should contain the date, the payment currency and the payment rate specified on the voucher
@@ -807,7 +838,7 @@ class account_voucher(osv.osv):
         if context is None:
             context = {}
         res = {'value': {}}
-        if currency_id and currency_id == payment_rate_currency_id:
+        if currency_id:
             #set the default payment rate of the voucher and compute the paid amount in company currency
             ctx = context.copy()
             ctx.update({'date': date})
@@ -872,6 +903,12 @@ class account_voucher(osv.osv):
         else:
             currency_id = journal.company_id.currency_id.id
         vals['value'].update({'currency_id': currency_id})
+        #in case we want to register the payment directly from an invoice, it's confusing to allow to switch the journal 
+        #without seeing that the amount is expressed in the journal currency, and not in the invoice currency. So to avoid
+        #this common mistake, we simply reset the amount to 0 if the currency is not the invoice currency.
+        if context.get('payment_expected_currency') and currency_id != context.get('payment_expected_currency'):
+            vals['value']['amount'] = 0
+            amount = 0
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
         for key in res.keys():
             vals[key].update(res[key])
@@ -1212,7 +1249,7 @@ class account_voucher(osv.osv):
                         # if the rate is specified on the voucher, it will be used thanks to the special keys in the context
                         # otherwise we use the rates of the system
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
-                if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
+                if line.amount == line.amount_unreconciled:
                     sign = voucher.type in ('payment', 'purchase') and -1 or 1
                     foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
 

addons/account_voucher/invoice.py

@@ -41,6 +41,7 @@ class invoice(osv.osv):
             'target': 'new',
             'domain': '[]',
             'context': {
+                'payment_expected_currency': inv.currency_id.id,
                 'default_partner_id': self.pool.get('res.partner')._find_accounting_partner(inv.partner_id).id,
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
                 'default_reference': inv.name,

addons/account_voucher/test/case4_cad_chf.yml

@@ -161,7 +161,7 @@
 -
   I check that the debtor account has 1 new line with -298.78 as amount_currency columns and 149.39 of credit and currency is CAD.
 -
-  I check that my currency rate difference is correct. 0 in debit with no amount_currency
+  I check that my currency rate difference is correct. 0 in debit with 98.78 CAD as amount_currency
 -
   I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
 -
@@ -176,7 +176,8 @@
         elif move_line.amount_currency == -298.78:
             assert move_line.credit == 149.39, "Debtor account has wrong entry."
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
-            assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+            assert move_line.amount_currency == 98.78, "Incorrect Currency Difference, got %s as amount_currency (expected 98.78)." % (move_line.amount_currency)
+            assert move_line.currency_id.id == ref('base.CAD'), "Incorrect Currency Difference, got %s (expected 'CAD')" % (move_line.currency_id.name)
         elif move_line.credit == 10.61:
             assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
         else:

addons/account_voucher/voucher_payment_receipt_view.xml

@@ -46,6 +46,9 @@
                 </search>
             </field>
         </record>
+
+        <!-- TODO: merge the 3 voucher form views of this file into a single view -->
+        <!-- Low priority view... If we open a voucher from a m2o, for example. -->
         <record model="ir.ui.view" id="view_low_priority_payment_form">
             <field name="name">account.voucher.payment.low.priority.form</field>
             <field name="model">account.voucher</field>
@@ -119,6 +122,7 @@
             </field>
         </record>
 
+        <!-- Supplier Payment -->
         <record model="ir.ui.view" id="view_vendor_payment_form">
             <field name="name">account.voucher.payment.form</field>
             <field name="model">account.voucher</field>
@@ -193,12 +197,16 @@
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
                                 <group>
-                                    <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
-                                        <separator string="Currency Options" colspan="4"/>
+                                    <group col="2" attrs="{'invisible':[('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="2"/>
                                         <field name="is_multi_currency" invisible="1"/>
-                                        <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
-                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+					<label for="payment_rate" colspan="1"/>
+					<div>
+                                            <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                            <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                        </div>
+                                        <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
+                                        <field name="paid_amount_in_company_currency" colspan="2" invisible="1"/>
                                     </group>
                                     <group col="2">
                                         <separator string="Payment Options" colspan="2"/>
@@ -282,6 +290,7 @@
         <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
+        <!-- Register Payment Form (old Pay Invoice wizard) -->
         <record model="ir.ui.view" id="view_vendor_receipt_dialog_form">
             <field name="name">account.voucher.receipt.dialog.form</field>
             <field name="model">account.voucher</field>
@@ -392,6 +401,7 @@
         </record>
 
 
+        <!-- Customer Payment -->
         <record model="ir.ui.view" id="view_vendor_receipt_form">
             <field name="name">account.voucher.receipt.form</field>
             <field name="model">account.voucher</field>
@@ -474,8 +484,12 @@
                                 </group>
                                 <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+				    <label for="payment_rate" colspan="1"/>
+				    <div>
+                                        <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                    </div>
+                                    <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
                                 <group>

addons/account_voucher/voucher_sales_purchase_view.xml

@@ -147,8 +147,9 @@
                     </notebook>
                     <group col="4" invisible="1">
                                     <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3" invisible="1"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency" invisible="1"/>
+                                    <field name="currency_help_label" invisible="1"/>
+                                    <field name="payment_rate" invisible="1"/>
+                                    <field name="payment_rate_currency_id"  invisible="1"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                     </group>
                     </sheet>
@@ -243,6 +244,7 @@
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
                                 groups="account.group_account_user"/>
                             <field name="paid_amount_in_company_currency" invisible="1"/>
+                            <field name="currency_help_label" invisible="1"/>
                         </group>
                     </group>
                     <notebook>

addons/anonymization/anonymization.py

@@ -543,6 +543,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             fixes = group(fixes, ('model_name', 'field_name'))
 
             for line in data:
+                queries = []
                 table_name = self.pool[line['model_id']]._table if line['model_id'] in self.pool else None
 
                 # check if custom sql exists:

addons/auth_openid/res_users.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution

addons/auth_openid/utils.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution

addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py

@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py

@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py

@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py

@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py

@@ -15,7 +15,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #  See:  http://www.gnu.org/licenses/lgpl.html
 #

addons/document_webdav/__openerp__.py

@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/document_webdav/test_davclient.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 #
 # Copyright P. Christeas <p_christ@hol.gr> 2008,2009
@@ -24,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 """ A trivial HTTP/WebDAV client, used for testing the server

addons/document_webdav/webdav_server.py

@@ -30,7 +30,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 

addons/hr_payroll/report/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

addons/hr_payroll/report/report_contribution_register.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

addons/hr_payroll/report/report_payslip.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

addons/hr_payroll/report/report_payslip_details.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

addons/hr_recruitment/hr_recruitment.py

@@ -510,8 +510,11 @@ class hr_job(osv.osv):
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
-            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
+        if context is None:
+            context = {}
+        alias_context = dict(context, alias_model_name='hr.applicant')
+        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init,
+            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=alias_context)
         return res
 
     def create(self, cr, uid, vals, context=None):

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

@@ -289,7 +289,7 @@ class hr_timesheet_line(osv.osv):
         return ts_line_ids
 
     _columns = {
-        'sheet_id': fields.function(_sheet, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet', select="1",
             type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
             store={
                     'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
@@ -473,12 +473,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 0.0 as total_attendance
                             from
                                 hr_analytic_timesheet hrt
-                                left join (account_analytic_line l
-                                    LEFT JOIN hr_timesheet_sheet_sheet s
-                                    ON (s.date_to >= l.date
-                                        AND s.date_from <= l.date
-                                        AND s.user_id = l.user_id))
-                                    on (l.id = hrt.line_id)
+                                JOIN account_analytic_line l ON l.id = hrt.line_id
+                                LEFT JOIN hr_timesheet_sheet_sheet s ON s.id = hrt.sheet_id
                             group by l.date::date, s.id
                         ) union (
                             select
@@ -489,14 +485,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
                             from
                                 hr_attendance a
-                                LEFT JOIN (hr_timesheet_sheet_sheet s
-                                    LEFT JOIN resource_resource r
-                                        LEFT JOIN hr_employee e
-                                        ON (e.resource_id = r.id)
-                                    ON (s.user_id = r.user_id))
-                                ON (a.employee_id = e.id
-                                    AND s.date_to >= date_trunc('day',a.name)
-                                    AND s.date_from <= a.name)
+                                LEFT JOIN hr_timesheet_sheet_sheet s
+                                ON s.id = a.sheet_id
                             WHERE action in ('sign_in', 'sign_out')
                             group by a.name::date, s.id
                         )) AS foo

addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml

@@ -13,11 +13,11 @@
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
-  I create a timesheet for employee "Quentin Paolinon".
+  I create a timesheet for employee "Quentin Paolino".
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     date_from: !eval time.strftime('%Y-%m-01')
-    name: Quentin Paolinon
+    name: Quentin Paolino
     state: new
     user_id: base.user_demo
     employee_id: 'hr.employee_qdp'
@@ -60,10 +60,12 @@
 -
   !python {model: hr_timesheet_sheet.sheet}: |
     uid = ref('base.user_root')
+    from openerp import netsvc
     try:
         self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"active_ids":
           [ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")],"active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
           })
+        assert True, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
     except:
         pass
 -
@@ -86,7 +88,7 @@
   !record {model: res.company, id: base.main_company}:
     timesheet_max_difference: 1.00
 -
-  I tried again to confirm the timesheet after modification.
+  I try again to confirm the timesheet after modification.
 -
   !python {model: hr_timesheet_sheet.sheet}: |
         uid = ref('base.user_root')

addons/l10n_ar/__init__.py

@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_bo/__init__.py

@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_ch/__init__.py

@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

addons/l10n_ch/__openerp__.py

@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,29 +24,29 @@
 
 {'name': 'Switzerland - Accounting',
  'description':  """
-Swiss localization :
-====================
-**Multilang swiss STERCHI account chart and taxes**
- **Author:** Camptocamp SA
+ Swiss localization :
+ ====================
+ **Multilang swiss STERCHI account chart and taxes**
+  **Author:** Camptocamp SA
 
- **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+  **Financial contributors:** Prisme Solutions Informatique SA, Quod SA
 
- **Translators:** brain-tec AG, Agile Business Group
+  **Translation contributors:** brain-tec AG, Agile Business Group
 
-**This release will introduce major changes to l10n_ch.**
+ **This release will introduce major changes to l10n_ch.**
 
-Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
+ Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
 
-- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
-- **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
-- **l10n_ch_bank**: List of swiss banks
-- **l10n_ch_zip**: List of swiss postal zip
-- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
-- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
-- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
+ - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
+ - **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
+ - **l10n_ch_bank**: List of swiss banks
+ - **l10n_ch_zip**: List of swiss postal zip
+ - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
+ - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
+ - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
 
-The modules will be soon available on OpenERP swiss localization on launchpad:
-https://launchpad.net/openerp-swiss-localization
+ The modules will be soon available on OpenERP swiss localization on launchpad:
+ https://launchpad.net/openerp-swiss-localization
 """,
  'version': '7.0',
  'author': 'Camptocamp',

addons/l10n_ch/account_wizard.py

@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

addons/l10n_cl/__init__.py

@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_es/__openerp__.py

@@ -4,57 +4,60 @@
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 2008-2010 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
 #                            Jordi Esteve <jesteve@zikzakmedia.com>
+#    Copyright (c) 2012-2013, Grupo OPENTIA (<http://opentia.com>) Registered EU Trademark.
+#                            Dpto. Consultoría <consultoria@opentia.es>
+#    Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
 #    $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
+#    it under the terms of the GNU Affero 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.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
-    'name': 'Spanish - Accounting (PGCE 2008)',
-    'version': '3.0',
-    'author': 'Spanish Localization Team',
-    'website': 'https://launchpad.net/openerp-spain',
-    'category': 'Localization/Account Charts',
-    'description': """
+    "name" : "Spanish Charts of Accounts (PGCE 2008)",
+    "version" : "3.0",
+    "author" : "Spanish Localization Team",
+    'website' : 'https://launchpad.net/openerp-spain',
+    "category" : "Localization/Account Charts",
+    "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
 
     * Defines the following chart of account templates:
         * Spanish General Chart of Accounts 2008
         * Spanish General Chart of Accounts 2008 for small and medium companies
+        * Spanish General Chart of Accounts 2008 for associations
     * Defines templates for sale and purchase VAT
     * Defines tax code templates
-
-**Note:** You should install the l10n_ES_account_balance_report module for yearly
-      account reporting (balance, profit & losses).
 """,
-    'license': 'GPL-3',
-    'depends': ['account', 'base_vat', 'base_iban'],
-    'data': [
-        'account_chart.xml',
-        'taxes_data.xml',
-        'fiscal_templates.xml',
-        'account_chart_pymes.xml',
-        'taxes_data_pymes.xml',
-        'fiscal_templates_pymes.xml',
-        'l10n_es_wizard.xml'
+    "license" : "AGPL-3",
+    "depends" : ["account", "base_vat", "base_iban"],
+    "data" : [
+        "account_chart.xml",
+        "taxes_data.xml",
+        "fiscal_templates.xml",
+        "account_chart_pymes.xml",
+        "taxes_data_pymes.xml",
+        "fiscal_templates_pymes.xml",
+        "account_chart_assoc.xml",
+        "taxes_data_assoc.xml",
+        "fiscal_templates_assoc.xml",
+        "l10n_es_wizard.xml",
     ],
-    'demo': [],
+    "demo" : [],
     'auto_install': False,
-    'installable': True,
+    "installable": True,
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_es/account_chart.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
     <!-- Tipos de cuenta para PGCE y PGCE PYMES -->
 
@@ -2722,7 +2722,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_281"/>
             <field name="type">view</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_2815_child" model="account.account.template">
@@ -2730,7 +2730,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_2815"/>
             <field name="type">other</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_2816" model="account.account.template">
@@ -4743,7 +4743,7 @@
         </record>
         <record id="pgc_460_child" model="account.account.template">
             <field name="code">460</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
@@ -4759,7 +4759,7 @@
         </record>
         <record id="pgc_465_child" model="account.account.template">
             <field name="code">465</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
@@ -4775,7 +4775,7 @@
         </record>
         <record id="pgc_466_child" model="account.account.template">
             <field name="code">466</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_466"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones mediante sistemas de aportación definida pendientes de pago</field>
@@ -4805,8 +4805,8 @@
             <field name="name">Hacienda Pública, deudora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4700_child" model="account.account.template">
-            <field name="code">4700</field>
+        <record id="pgc_470000" model="account.account.template">
+            <field name="code">470000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4700"/>
             <field name="type">receivable</field>
@@ -4869,6 +4869,14 @@
             <field name="name">Hacienda Pública, IVA soportado</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_473" model="account.account.template">
             <field name="code">473</field>
             <field name="reconcile" eval="False"/>
@@ -4877,6 +4885,14 @@
             <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_473000" model="account.account.template">
+            <field name="code">473000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_474" model="account.account.template">
             <field name="code">474</field>
             <field name="reconcile" eval="False"/>
@@ -4949,8 +4965,8 @@
             <field name="name">Hacienda Pública, acreedora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4750_child" model="account.account.template">
-            <field name="code">4750</field>
+        <record id="pgc_475000" model="account.account.template">
+            <field name="code">475000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4750"/>
             <field name="type">payable</field>
@@ -4965,8 +4981,8 @@
             <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4751_child" model="account.account.template">
-            <field name="code">4751</field>
+        <record id="pgc_475100" model="account.account.template">
+            <field name="code">475100</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4751"/>
             <field name="type">payable</field>
@@ -5029,6 +5045,14 @@
             <field name="name">Hacienda Pública, IVA repercutido</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_479" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
@@ -8722,7 +8746,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_66"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="name">Intereses de deudas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6620" model="account.account.template">
@@ -8730,7 +8754,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6620_child" model="account.account.template">
@@ -8738,7 +8762,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6620"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6621" model="account.account.template">
@@ -8746,7 +8770,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6621_child" model="account.account.template">
@@ -8754,7 +8778,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6621"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6622" model="account.account.template">
@@ -8762,7 +8786,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6622_child" model="account.account.template">
@@ -8770,7 +8794,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6622"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6623" model="account.account.template">
@@ -8778,7 +8802,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6623_child" model="account.account.template">
@@ -8786,7 +8810,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6623"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6624" model="account.account.template">
@@ -8794,7 +8818,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6624_child" model="account.account.template">
@@ -8802,7 +8826,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6624"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_663" model="account.account.template">

addons/l10n_es/account_chart_pymes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
   
       <!-- 
       Plantilla del árbol de cuentas del Plan General Contable PYMES 2008.
@@ -11,23 +11,23 @@
       como base para los siguientes cambios:
 
       - Se eliminan las cuentas: 
-            (111), (1110), (1111), (1143), (115), (133), (134), (1340), (1341),
+    	    (111), (1110), (1111), (1143), (115), (133), (134), (1340), (1341),
                 (135), (136), (140), (146), (147), (1765), (1768), (178), (189),
-            (204), (2550), (2553), (257),
-            (466),
-            (501), (5091), (5290), (5296), (5297), (553), (5530), (5531),
+    	    (204), (2550), (2553), (257),
+    	    (466),
+    	    (501), (5091), (5290), (5296), (5297), (553), (5530), (5531),
                 (5532), (5533), (5593), (5598), (569), (58), (580), (581),
                 (582), (583), (584), (585), (586), (587), (588), (589),
                 (599), (5990), (5991), (5992), (5993), (5994),
-            (643), (643), (644), (645), (644), (6440), (6442), (645), (6450), 
+    	    (643), (643), (644), (645), (644), (6440), (6442), (645), (6450), 
                 (6457), (6630), (6631), (6632), (6633),
-            (7630), (7631), (7632), (7633), (767), (774), (7950), (7956), (7957);
-            el grupo 8 entero;
-            el grupo 9 entero.
+    	    (7630), (7631), (7632), (7633), (767), (774), (7950), (7956), (7957);
+    	    el grupo 8 entero;
+    	    el grupo 9 entero.
       - Cambian de nombre las cuentas: 
-            (2935), (296), (5935), (596), (7962), (7963)
+    	    (2935), (296), (5935), (596), (7962), (7963)
       - Se crean las cuentas:
-            (5590), (5595), (663), (763)
+    	    (5590), (5595), (663), (763)
 
       Otros cambios:
 
@@ -2357,7 +2357,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_281"/>
             <field name="type">view</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_pymes_2815_child" model="account.account.template">
@@ -2365,7 +2365,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_2815"/>
             <field name="type">other</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_pymes_2816" model="account.account.template">
@@ -4410,7 +4410,7 @@
         </record>
         <record id="pgc_pymes_460_child" model="account.account.template">
             <field name="code">460</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
@@ -4426,7 +4426,7 @@
         </record>
         <record id="pgc_pymes_465_child" model="account.account.template">
             <field name="code">465</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
@@ -4456,8 +4456,8 @@
             <field name="name">Hacienda Pública, deudora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_pymes_4700_child" model="account.account.template">
-            <field name="code">4700</field>
+        <record id="pgc_pymes_470000" model="account.account.template">
+            <field name="code">470000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_4700"/>
             <field name="type">receivable</field>
@@ -4520,6 +4520,14 @@
             <field name="name">Hacienda Pública, IVA soportado</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_pymes_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_pymes_473" model="account.account.template">
             <field name="code">473</field>
             <field name="reconcile" eval="False"/>
@@ -4600,8 +4608,8 @@
             <field name="name">Hacienda Pública, acreedora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_pymes_4750_child" model="account.account.template">
-            <field name="code">4750</field>
+        <record id="pgc_pymes_475000" model="account.account.template">
+            <field name="code">475000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_4750"/>
             <field name="type">payable</field>
@@ -4680,6 +4688,14 @@
             <field name="name">Hacienda Pública, IVA repercutido</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_pymes_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública, IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_pymes_479" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
@@ -7869,7 +7885,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_66"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="name">Intereses de deudas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6620" model="account.account.template">
@@ -7877,7 +7893,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6620_child" model="account.account.template">
@@ -7885,7 +7901,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6620"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6621" model="account.account.template">
@@ -7893,7 +7909,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6621_child" model="account.account.template">
@@ -7901,7 +7917,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6621"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6622" model="account.account.template">
@@ -7909,7 +7925,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6622_child" model="account.account.template">
@@ -7917,7 +7933,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6622"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6623" model="account.account.template">
@@ -7925,7 +7941,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6623_child" model="account.account.template">
@@ -7933,7 +7949,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6623"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6624" model="account.account.template">
@@ -7941,7 +7957,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6624_child" model="account.account.template">
@@ -7949,7 +7965,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6624"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_663" model="account.account.template">

addons/l10n_fr/__init__.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/__openerp__.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 {

addons/l10n_fr/report/__init__.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/report/base_report.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/report/bilan_report.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/report/compute_resultant_report.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/wizard/__init__.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/wizard/fr_report_bilan.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr/wizard/fr_report_compute_resultant.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_fr_hr_payroll/report/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

addons/l10n_in_hr_payroll/report/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################

addons/l10n_nl/__init__.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 

addons/l10n_nl/__openerp__.py

@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 #

addons/l10n_nl/account_chart_netherlands.xml

@@ -3940,7 +3940,7 @@
         <record id="btw_code_2a" model="account.tax.code.template">
             <field name="code">2a</field>
             <field name="parent_id" ref="btw_code_verlegging"/>
-            <field name="name">Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (BTW)</field>
+            <field name="name">Heffing van omzetbelasting is naar u verlegd (BTW)</field>
         </record>
 <!-- Voor rubriek 3 hoeft geen omzetbelasting aangegeven te worden, wel het omzet bedrag, zie hiervoor verderop
      3. Leveringen naar het buitenland -->
@@ -4052,7 +4052,7 @@
         <record id="omz_code_2a" model="account.tax.code.template">
             <field name="code">2a</field>
             <field name="parent_id" ref="omz_code_verlegging"/>
-            <field name="name">Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
+            <field name="name">Heffing van omzetbelasting is naar u verlegd (omzet)</field>
         </record>
 <!-- 3. Leveringen naar het buitenland -->
         <record id="omz_code_naar_buitenland" model="account.tax.code.template">
@@ -4260,7 +4260,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="omz_code_1e" name="ref_base_code_id"/>
             <field name="ref_base_sign" eval="-1"/>
             <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="btw_ink_0" model="account.tax.template">
             <field name="sequence">15</field>
@@ -4279,9 +4279,9 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="True" name="child_depend"/>
         </record>
         <record id="btw_ink_0_1" model="account.tax.template">
-            <field name="sequence">99</field>
+            <field name="sequence">98</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW af te dragen verlegd (inkopen1)</field>
+            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
             <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
             <field eval="btw_ink_0" name="parent_id"/>
@@ -4304,54 +4304,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_paid_id" ref="vat_payable_verlegd"/>
             <field eval="btw_code_5b" name="tax_code_id"/>
             <field eval="btw_code_5b" name="ref_tax_code_id"/>
+            <field name="tax_sign" eval="-1"/>
             <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="btw_ink2_0" model="account.tax.template">
-            <field name="sequence">15</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen)</field>
-            <field name="description">21% BTW verlegd</field>
-            <field eval="0.21" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="omz_code_2a" name="base_code_id"/>
-            <field eval="omz_code_2a" name="ref_base_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-            <field eval="True" name="child_depend"/>
-        </record>
-        <record id="btw_ink2_0_1" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="btw_ink2_0" name="parent_id"/>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="btw_code_2a" name="tax_code_id"/>
-            <field eval="btw_code_2a" name="ref_tax_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="btw_ink2_0_2" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen2)</field>
-            <field eval="-1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="btw_ink2_0" name="parent_id"/>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="btw_code_5b" name="tax_code_id"/>
-            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
 <!-- Binnen de EU -->
@@ -4402,6 +4356,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
         </record>
         <record id="btw_I_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
+            <field name="sequence">20</field>
             <field name="name">Inkopen import binnen EU hoog</field>
             <field name="description">21% BTW import binnen EU</field>
             <field eval="0.21" name="amount"/>

addons/l10n_nl/account_fiscal_position_tax_template.xml

@@ -90,6 +90,13 @@
             <field name="tax_dest_id" ref="l10n_nl.btw_I_overig"/>
         </record>
         
+        <record id="position_tax_transferred" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_transferred"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_ink_0"/>
+        </record>
+
+
         <!-- Again, Belgian schema has 17 (!) more records. Missing VAT 0
              and separation of goods and services .. -->
 

addons/l10n_nl/account_fiscal_position_template.xml

@@ -7,6 +7,10 @@
             <field name="name">Binnenland</field>
             <field name="chart_template_id" ref="l10nnl_chart_template" />
         </record>
+        <record id="fiscal_position_template_transferred" model="account.fiscal.position.template">
+            <field name="name">BTW verlegd</field>
+            <field name="chart_template_id" ref="l10nnl_chart_template" />
+        </record>
         <record id="fiscal_position_template_eu" model="account.fiscal.position.template">
             <field name="name">EU landen</field>
             <field name="chart_template_id" ref="l10nnl_chart_template" />

addons/l10n_pa/__init__.py

@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################