merge

bzr revid: fp@tinyerp.com-20090204125315-1vibwl7pvwndcfuv

addons/account/__terp__.py

@@ -70,6 +70,6 @@
     ],
     'installable': True,
     'active': False,
-    'certificate': '80331923549',
+    'certificate': '0080331923549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account.py

@@ -935,7 +935,7 @@ class account_move(osv.osv):
     # Validate a balanced move. If it is a centralised journal, create a move.
     #
     def validate(self, cr, uid, ids, context={}):
-        if '__last_update' in context:
+        if context and ('__last_update' in context):
             del context['__last_update']
         ok = True
         for move in self.browse(cr, uid, ids, context):

addons/account_analytic_analysis/__terp__.py

@@ -43,6 +43,6 @@ Add menu to show relevant information for each manager.""",
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '42927202589',
+    'certificate': '0042927202589',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_default/__terp__.py

@@ -41,6 +41,6 @@ Allows to automatically select analytic accounts based on criterions:
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '74229833581',
+    'certificate': '0074229833581',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_plans/__terp__.py

@@ -66,6 +66,6 @@ for one account entry.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '36417675373',
+    'certificate': '0036417675373',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_balance/__terp__.py

@@ -47,6 +47,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '81928745309',
+    'certificate': '0081928745309',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_budget/__terp__.py

@@ -58,6 +58,6 @@ Three reports are available:
     'demo_xml': ['crossovered_budget_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '43819694157',
+    'certificate': '0043819694157',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_chart/__terp__.py

@@ -33,6 +33,6 @@
     'update_xml': [],
     'demo_xml': [],
     'installable': True,
-    'certificate': '73332443901',
+    'certificate': '0073332443901',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_date_check/__terp__.py

@@ -42,6 +42,6 @@ period !"
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '66174843389',
+    'certificate': '0066174843389',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_followup/__terp__.py

@@ -45,12 +45,12 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/wizard_view.xml',
-        'followup_report_view.xml',
         'followup_view.xml',
+        'followup_report_view.xml'
     ],
     'demo_xml': ['followup_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '72481076453',
+    'certificate': '0072481076453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_invoice_layout/__terp__.py

@@ -48,6 +48,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '57235078173',
+    'certificate': '0057235078173',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/__terp__.py

@@ -49,6 +49,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '61703998541',
+    'certificate': '0061703998541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_report/__terp__.py

@@ -42,6 +42,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '50976406925',
+    'certificate': '0050976406925',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_reporting/__terp__.py

@@ -39,6 +39,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '72305016797',
+    'certificate': '0072305016797',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_tax_include/__terp__.py

@@ -38,6 +38,6 @@ This module implement the modification on the invoice form.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '70514190381',
+    'certificate': '0070514190381',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_voucher/__terp__.py

@@ -49,6 +49,6 @@ Basic Accounting, plus new things that are available:
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '37580727101',
+    'certificate': '0037580727101',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/analytic_journal_billing_rate/__terp__.py

@@ -40,6 +40,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '30271787965',
+    'certificate': '0030271787965',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/analytic_user_function/__terp__.py

@@ -40,6 +40,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '82277138269',
+    'certificate': '0082277138269',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/auction/__terp__.py

@@ -42,6 +42,6 @@
     'demo_xml': ['auction_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '39333102717',
+    'certificate': '0039333102717',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/audittrail/__terp__.py

@@ -39,6 +39,6 @@
     'demo_xml': ['audittrail_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '62572348749',
+    'certificate': '0062572348749',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_contact/__terp__.py

@@ -51,6 +51,6 @@
     'demo_xml': ['base_contact_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '31287885469',
+    'certificate': '0031287885469',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_contact/base_contact_demo.xml

@@ -4,7 +4,7 @@
         <!-- Create the functions -->
         <record id="res_partner_function_privateaddress0" model="res.partner.function">
             <field eval="&quot;&quot;&quot;Private Address&quot;&quot;&quot;" name="name"/>
-            <field name="ref"></field>
+            <field name="code">PA</field>
         </record>
 
         <!-- Create the contacts -->

addons/base_iban/__terp__.py

@@ -35,6 +35,6 @@ This module install the base for IBAN bank accounts.
     'update_xml': ['base_iban_view.xml'],
     'installable': True,
     'active': False,
-    'certificate': '50014379549',
+    'certificate': '0050014379549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_iban/base_iban.py

@@ -38,13 +38,13 @@ class res_partner_bank(osv.osv):
 
     def create(self, cr, uid, vals, context={}):
         #overwrite to format the iban number correctly
-        if vals.has_key('iban'):
+        if 'iban' in vals and vals['iban']:
             vals['iban'] = _format_iban(vals['iban'])
         return super(res_partner_bank, self).create(cr, uid, vals, context)
 
     def write(self, cr, uid, ids, vals, context={}):
         #overwrite to format the iban number correctly
-        if vals.has_key('iban'):
+        if 'iban' in vals and vals['iban']:
             vals['iban'] = _format_iban(vals['iban'])
         return super(res_partner_bank, self).write(cr, uid, ids, vals, context)
 

addons/base_module_merge/__terp__.py

@@ -41,6 +41,6 @@
     'update_xml': ['base_module_merge_wizard.xml'],
     'demo_xml': [],
     'installable': True,
-    'certificate': '35756279709',
+    'certificate': '0035756279709',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_module_publish/__terp__.py

@@ -43,6 +43,6 @@ to call this button when you want to release a new version of your module.
     'update_xml': ['base_module_publish_wizard.xml'],
     'demo_xml': [],
     'installable': True,
-    'certificate': '67939821245',
+    'certificate': '0067939821245',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_module_record/__terp__.py

@@ -51,6 +51,6 @@ How to use it:
     'update_xml': ['security/ir.model.access.csv', 'base_module_record_wizard.xml'],
     'demo_xml': [],
     'installable': True,
-    'certificate': '83134865813',
+    'certificate': '0083134865813',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_module_record/base_module_record.py

@@ -182,7 +182,7 @@ class base_module_record(osv.osv):
                     val = str(val)
 
                 val = val and ('"""%s"""' % val.replace('\\', '\\\\').replace('"', '\"')) or 'False'
-                field.setAttribute(u"eval",  val)
+                field.setAttribute(u"eval",  val.decode('utf-8'))
                 record.appendChild(field)
         return record_list, noupdate
 
@@ -324,8 +324,8 @@ class base_module_record(osv.osv):
                         data.appendChild(res)
                 elif rec[0]=='assert':
                         pass
-            res = doc.toprettyxml(indent="\t")
+
-            return  doc.toprettyxml(indent="\t").encode('utf8')
+            return doc.toprettyxml(indent="\t").encode('utf-8')
 base_module_record()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/base_report_creator/__terp__.py

@@ -44,6 +44,6 @@ the "Dashboard" menu.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '31285794149',
+    'certificate': '0031285794149',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_report_designer/__terp__.py

@@ -37,6 +37,6 @@ OpenOffice.
     'demo_xml': ['base_report_data.xml'],
     'installable': True,
     'active': False,
-    'certificate': '56379010493',
+    'certificate': '0056379010493',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_setup/__terp__.py

@@ -46,6 +46,6 @@
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
     'active': True,
-    'certificate': '86711085869',
+    'certificate': '0086711085869',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_vat/__terp__.py

@@ -31,6 +31,6 @@
     'update_xml': ['base_vat_data.xml'],
     'installable': True,
     'active': False,
-    'certificate': '84849360989',
+    'certificate': '0084849360989',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '76912305725',
+    'certificate': '0076912305725',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_account/__terp__.py

@@ -48,6 +48,6 @@
     'demo_xml': ['board_account_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '76016921229',
+    'certificate': '0076016921229',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_association/__terp__.py

@@ -34,6 +34,6 @@ This module implements a dashboard for associations.
     'demo_xml': ['board_association_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '79647781773',
+    'certificate': '0079647781773',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_auction/__terp__.py

@@ -35,6 +35,6 @@
     'demo_xml': ['board_auction_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '49187078189',
+    'certificate': '0049187078189',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_crm_configuration/__terp__.py

@@ -40,6 +40,6 @@ This module implements a dashboard for CRM that includes:
     'demo_xml': ['board_crm_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '71599098909',
+    'certificate': '0071599098909',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_document/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': ['board_document_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '44628458429',
+    'certificate': '0044628458429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_manufacturing/__terp__.py

@@ -38,6 +38,6 @@
     'demo_xml': ['board_manufacturing_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '30407612797',
+    'certificate': '0030407612797',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_project/__terp__.py

@@ -47,6 +47,6 @@ This module implements a dashboard for project member that includes:
     'demo_xml': ['board_project_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '39350482013',
+    'certificate': '0039350482013',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_sale/__terp__.py

@@ -39,6 +39,6 @@ This module implements a dashboard for salesman that includes:
     'demo_xml': ['board_sale_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '46503501021',
+    'certificate': '0046503501021',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/crm/__terp__.py

@@ -57,6 +57,6 @@ between mails and Open ERP.""",
     'demo_xml': ['crm_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '79056041421',
+    'certificate': '0079056041421',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/crm/crm_view.xml

@@ -34,7 +34,7 @@
                             <field name="sequence"/>
                             <field name="active" select="2"/>
                             <field name="user_id" select="2"/>
-                            <field name="parent_id" select="2"/>
+                            <field name="parent_id" select="2" domain="[('id', '!=', active_id)]"/>
                             <field name="reply_to" select="2"/>
                             <label colspan="2" string="Complete this if you use the mail gateway."/>
                         </page>

addons/crm_configuration/__terp__.py

@@ -55,6 +55,6 @@ meetings, eso.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '80531386589',
+    'certificate': '0080531386589',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/crm_profiling/__terp__.py

@@ -45,6 +45,6 @@
     'demo_xml': ['crm_profiling_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '33984979005',
+    'certificate': '0033984979005',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/crm_vertical/__terp__.py

@@ -33,6 +33,6 @@
     'update_xml': [],
     'demo_xml': [],
     'installable': True,
-    'certificate': '59915476845',
+    'certificate': '0059915476845',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/delivery/__terp__.py

@@ -38,6 +38,6 @@
     'demo_xml': ['delivery_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '33981912253',
+    'certificate': '0033981912253',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/document/__terp__.py

@@ -43,6 +43,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '70515416461',
+    'certificate': '0070515416461',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/document_ics/__terp__.py

@@ -34,6 +34,6 @@
     'demo_xml': ['document_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '71242387229',
+    'certificate': '0071242387229',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/event/__terp__.py

@@ -51,6 +51,6 @@
     'demo_xml': ['event_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '83059161581',
+    'certificate': '0083059161581',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/event_project/__terp__.py

@@ -36,6 +36,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '69726863885',
+    'certificate': '0069726863885',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/google_map/__terp__.py

@@ -36,6 +36,6 @@ url widget.""",
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '29498930765',
+    'certificate': '0029498930765',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr/__terp__.py

@@ -50,6 +50,6 @@
     'demo_xml': ['hr_demo.xml', 'hr_department_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '86710558965',
+    'certificate': '0086710558965',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_attendance/__terp__.py

@@ -38,6 +38,6 @@
     'demo_xml': ['hr_attendance_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '63495605613',
+    'certificate': '0063495605613',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_contract/__terp__.py

@@ -45,6 +45,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '46298028637',
+    'certificate': '0046298028637',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_expense/__terp__.py

@@ -54,6 +54,6 @@
     'demo_xml': ['hr_expense_demo.xml', 'hr.expense.expense.csv'],
     'installable': True,
     'active': False,
-    'certificate': '62479841789',
+    'certificate': '0062479841789',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_expense/hr.expense.expense.csv

@@ -1,4 +1,3 @@
 name,ref,employee_id,line_ids/date_value,line_ids/name,line_ids/analytic_account,line_ids/unit_quantity,line_ids/ref,line_ids/unit_amount
 September Expenses,09/06,Fabien Pinckaers,2006-09-05,Travel by Car - Customer Seagate 2 - Double,Thymbra,130.0,,0.22
-,,,2006-09-05,Travel by Car - Trainging,Trainings,100.0,,0.22
 ,,,2006-09-05,Basic PC - Server for Seagate,Seagate P2,1.0,S1234435,300.0

addons/hr_expense/hr_expense_demo.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        
-    </data>
-</openerp>

addons/hr_holidays/__terp__.py

@@ -41,6 +41,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '86579209325',
+    'certificate': '0086579209325',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_timesheet/__terp__.py

@@ -50,6 +50,6 @@ to set up a management by affair.
     'demo_xml': ['hr_timesheet_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '71405533469',
+    'certificate': '0071405533469',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_timesheet_invoice/__terp__.py

@@ -42,6 +42,6 @@ reports, eso.""",
     'demo_xml': ['hr_timesheet_invoice_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '56091842381',
+    'certificate': '0056091842381',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_timesheet_sheet/__terp__.py

@@ -57,6 +57,6 @@ The validation can be configured in te company:
     'demo_xml': ['hr_timesheet_sheet_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '73297700829',
+    'certificate': '0073297700829',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/idea/__terp__.py

@@ -38,6 +38,6 @@
     ],
     'demo_xml': [],
     'installable': True,
-    'certificate': '71515601309',
+    'certificate': '0071515601309',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_be/__init__.py

@@ -20,6 +20,7 @@
 #
 ##############################################################################
 
+import company
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_be/__terp__.py

@@ -58,6 +58,6 @@
                     'account.report.report.csv'
                 ],
     'installable': True,
-    'certificate': '31977724637',
+    'certificate': '0031977724637',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_be/company.py

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). 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://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+
+class res_company(osv.osv):
+    _inherit = "res.company"
+    _description = 'res.company'
+
+
+    def _get_default_ad(self, addresses):
+        city = post_code = address = ""
+        for ads in addresses:
+            if ads.type == 'default':
+                city = ads.city
+                post_code = ads.zip
+                if ads.street:
+                    address = ads.street
+                if ads.street2:
+                    address += " " + ads.street2
+        return city, post_code, address
+res_company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_be/wizard/account_vat_declaration.py

@@ -25,6 +25,8 @@ import datetime
 import pooler
 import base64
 
+from tools.translate import _
+
 form_fyear = """<?xml version="1.0"?>
 <form string="Select Period">
     <field name="period" />
@@ -48,6 +50,7 @@ fields = {
         'readonly': True,},
 }
 
+
 class wizard_vat_declaration(wizard.interface):
 
     def _create_xml(self, cr, uid, data, context):
@@ -58,7 +61,7 @@ class wizard_vat_declaration(wizard.interface):
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
         if not vat_no:
-            raise wizard.except_wizard('Data Insufficient','No VAT Number Associated with Main Company!')
+            raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
         tax_ids = pool_obj.get('account.tax.code').search(cr,uid,[])
         ctx = context.copy()
@@ -69,30 +72,33 @@ class wizard_vat_declaration(wizard.interface):
         if not obj_company.partner_id.address:
                 address=post_code=city=''
 
-        for ads in obj_company.partner_id.address:
+        city, post_code, address = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
-                if ads.type=='default':
-                    if ads.zip_id:
-                        city=ads.zip_id.city
-                        post_code=ads.zip_id.name
-                    if ads.street:
-                        address=ads.street
-                    if ads.street2:
-                        address +=ads.street2
 
         obj_fyear = pool_obj.get('account.fiscalyear')
         year_id = obj_fyear.find(cr, uid)
         current_year = obj_fyear.browse(cr,uid,year_id).name
-        month=time.strftime('%m')
 
         period_code = pool_obj.get('account.period').browse(cr, uid, data['form']['period']).code
+
         send_ref = user_cmpny
         if period_code:
             send_ref = send_ref + period_code
 
         data_of_file='<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-14.xml">'
-        data_of_file +='\n\t<DECLARER>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<NAME>'+str(obj_company.name)+'</NAME>\n\t\t<ADDRESS>'+str(address)+'</ADDRESS>'
+        data_of_file +='\n\t<DECLARER>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<NAME>'+str(obj_company.name)+'</NAME>\n\t\t<ADDRESS>'+address+'</ADDRESS>'
-        data_of_file +='\n\t\t<POSTCODE>'+str(post_code)+'</POSTCODE>\n\t\t<CITY>'+str(city)+'</CITY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
+        data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
-        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t<MONTH>'+str(month)+'</MONTH>\n\t\t\t<YEAR>'+str(current_year[-4:])+'</YEAR>\n\t\t</DPERIODE>\n\t\t<ASK RESTITUTION="NO" PAYMENT="NO"/>'
+        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
+
+        starting_month = pool_obj.get('account.period').browse(cr, uid, data['form']['period']).date_start[5:7]
+        ending_month = pool_obj.get('account.period').browse(cr, uid, data['form']['period']).date_stop[5:7]
+        if starting_month != ending_month:
+            #starting month and ending month of selected period are not the same 
+            #it means that the accounting isn't based on periods of 1 month but on quarters
+            quarter = str(((int(starting_month) - 1) / 3) + 1)
+            data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
+        else:
+            data_of_file += '<MONTH>'+starting_month+'</MONTH>\n\t\t\t'
+        data_of_file += '<YEAR>'+str(current_year[-4:])+'</YEAR>\n\t\t</DPERIODE>\n\t\t<ASK RESTITUTION="NO" PAYMENT="NO"/>'
         data_of_file +='\n\t\t<DATA>\n\t\t\t<DATA_ELEM>'
 
         for item in tax_info:

addons/l10n_be/wizard/partner_vat_listing.py

@@ -76,8 +76,7 @@ class wizard_vat(wizard.interface):
 #        obj_company=pooler.get_pool(cr.dbname).get('res.company').browse(cr,uid,1)
 #        vat_company=obj_company.partner_id.vat
 
-#TODO:  can be improved if we replace this test => add a new field on res_partner for cases when a partner has a number and is not subjected to the VAT... have to see if this situation could happen
+        p_id_list=pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat_subjected','!=',False)])
-        p_id_list=pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat','!=',False)])
 
         if not p_id_list:
              raise wizard.except_wizard('Data Insufficient!','No partner has a VAT Number asociated with him.')

addons/l10n_chart_uk_minimal/__terp__.py

@@ -76,6 +76,6 @@
     ],
     'demo_xml': [],
     'installable': True,
-    'certificate': '64392144797',
+    'certificate': '0064392144797',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_lu/__terp__.py

@@ -44,6 +44,6 @@ This module installs:
     ],
     'demo_xml': ['account.report.report.csv'],
     'installable': True,
-    'certificate': '78164766621',
+    'certificate': '0078164766621',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/membership/__terp__.py

@@ -49,6 +49,6 @@ invoice and send propositions for membership renewal.
     'demo_xml': ['membership_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '42907796381',
+    'certificate': '0042907796381',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/mrp/__terp__.py

@@ -75,6 +75,6 @@
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
     'active': False,
-    'certificate': '32052481373',
+    'certificate': '0032052481373',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/mrp_jit/__terp__.py

@@ -42,6 +42,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '86634760061',
+    'certificate': '0086634760061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/mrp_operations/__terp__.py

@@ -64,6 +64,6 @@
     'demo_xml': ['mrp_operation_data.xml'],
     'installable': True,
     'active': False,
-    'certificate': '56233813133',
+    'certificate': '0056233813133',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/mrp_repair/__terp__.py

@@ -47,6 +47,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '60814381277',
+    'certificate': '0060814381277',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/mrp_subproduct/__terp__.py

@@ -41,6 +41,6 @@ With this module:
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '50060616733',
+    'certificate': '0050060616733',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/point_of_sale/__terp__.py

@@ -50,6 +50,6 @@ Main features :
     ],
     'demo_xml': [],
     'installable': True,
-    'certificate': '48272150909',
+    'certificate': '0048272150909',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/process/__terp__.py

@@ -36,6 +36,6 @@ This module allows you to manage your process for the end-users.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '55447636669',
+    'certificate': '0055447636669',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/product/__terp__.py

@@ -64,6 +64,6 @@
     'demo_xml': ['product_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '68861431437',
+    'certificate': '0068861431437',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/product_margin/__terp__.py

@@ -36,6 +36,6 @@ the report has several options to help you get the data you need.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '64392591773',
+    'certificate': '0064392591773',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/profile_accounting/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '38455352045',
+    'certificate': '0038455352045',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/profile_association/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '78696047261',
+    'certificate': '0078696047261',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/profile_auction/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '65280135565',
+    'certificate': '0065280135565',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/profile_crm/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '73301264221',
+    'certificate': '0073301264221',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/profile_manufacturing/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '27737506213',
+    'certificate': '0027737506213',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/profile_service/__terp__.py

@@ -32,6 +32,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '30405502077',
+    'certificate': '0030405502077',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project/__terp__.py

@@ -45,6 +45,6 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
     'demo_xml': ['project_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '75116868317',
+    'certificate': '0075116868317',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project_gtd/__terp__.py

@@ -49,6 +49,6 @@ performing those tasks.
     'demo_xml': ['project_gtd_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '43525236301',
+    'certificate': '0043525236301',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project_mrp/__terp__.py

@@ -40,6 +40,6 @@ created by sales orders.
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '31976495453',
+    'certificate': '0031976495453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project_retro_planning/__terp__.py

@@ -34,6 +34,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '57235475485',
+    'certificate': '0057235475485',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project_timesheet/__terp__.py

@@ -38,6 +38,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '75123647453',
+    'certificate': '0075123647453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/purchase/__terp__.py

@@ -47,6 +47,6 @@
     'demo_xml': ['purchase_demo.xml'],
     'installable': True,
     'active': False,
-    'certificate': '57234283549',
+    'certificate': '0057234283549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/purchase_analytic_plans/__terp__.py

@@ -36,6 +36,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '62176518909',
+    'certificate': '0062176518909',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_account/__terp__.py

@@ -34,6 +34,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '61754222813',
+    'certificate': '0061754222813',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_analytic/__terp__.py

@@ -34,6 +34,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '59950675429',
+    'certificate': '0059950675429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_analytic_line/__terp__.py

@@ -34,6 +34,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '75179053853',
+    'certificate': '0075179053853',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_analytic_planning/__terp__.py

@@ -38,6 +38,6 @@
     'demo_xml': ['report_account_analytic.planning.csv'],
     'installable': True,
     'active': False,
-    'certificate': '34901836973',
+    'certificate': '0034901836973',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_crm/__terp__.py

@@ -35,6 +35,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '30422968285',
+    'certificate': '0030422968285',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_document/__terp__.py

@@ -37,6 +37,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '68012774557',
+    'certificate': '0068012774557',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/report_intrastat/__terp__.py

@@ -38,6 +38,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '56982189085',
+    'certificate': '0056982189085',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: