[MERGE] latest trunk

bzr revid: abo@openerp.com-20120828171936-upwug8lze2anni7l
bzr revid: abo@openerp.com-20120829093255-01m8hy8c7pccol73
bzr revid: abo@openerp.com-20120829133240-zn21qghw0zp1ungw

addons/account/product_view.xml

@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Accounting" groups="base.group_user">
+                    <page string="Accounting" groups="account.group_account_user">
                         <group name="properties">
                             <group>
                                 <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>

addons/account_asset/i18n/nb.po

@@ -0,0 +1,839 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-28 14:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Eiendeler i utkastet og åpen stater"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Slutt dato"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "restverdi"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Avskr. utgiftskonto"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Beregn eiendel"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "bruttobeløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Eiendel"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Angir at den første avskrivninger oppføring for denne eiendelen må gjøres "
+"fra kjøpsdato i stedet for første januar"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Historie navn"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modifiser"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Løper"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "avskrivningsbeløpet"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "eiendeler Analyse"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Grunn"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "degressive faktor"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+"Denne veiviseren vil legge inn avskrivning linjer som kjører eiendeler som "
+"tilhører den valgte perioden."
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Inngang"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Avskrivninger linjer"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "det er mengden du har tenkt å ha du ikke kan avskrive."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Avskrivninger  Dato"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Eiendel Konto"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Skrevet Beløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "avskrivnings konto"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Avskrivnings Inngang"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "Ant. Avskrivninger linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Eiendeler i utkast"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Sluttdato"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr "Konto Eiendel"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Beregn Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "Sekvens av svekkelsen"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Periode lengde"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Dato for kjøpsavtalen"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Beregner Avskrivninger innen angitt intervall"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Endre Varighet"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analytisk konto"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Beregningsmetoden"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Oppgi her tiden under 2 avskrivninger, i måneder."
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis kan bare brukes for tiden metoden \"antall avskrivninger\"."
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Metode for å beregne datoene og antall avskrivninger linjer.\n"
+"Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+"Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke gå "
+"utover."
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "Bruttoverdi "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "Feil! Du kan ikke lage rekrusive eiendeler."
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiden i måneden mellom to avskrivninger"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Endre eiendel"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Annen informasjon"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Restverdi"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Satt til Lukk."
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "Beregn eiendeler"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Endre eiendel."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Eiendeler i lukket tilstand"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "overordnede Eiendel"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Eiendel historie"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "Eiendeler som er kjøpt i inneværende år"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Avskrivninger Styret"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Elementer"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Ikke resultatført beløp"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "tid Metode"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Velg metoden som skal brukes for å beregne mengden av avskrivninger linjer.\n"
+"* Lineær: Beregnet på grunnlag av: bruttoverdi / Antall Avskrivninger\n"
+"* Degressiv: Beregnet på grunnlag av: restverdi * degressiv faktor"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Velg metoden som skal brukes for å beregne datoene og antall avskrivninger "
+"linjer.\n"
+" * Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+" * Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke "
+"gå utover."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Eiendeler i rennende staten"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Størrelsen på avskrivningene linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Postet avskrivninger linjer"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Barn Eiendeler"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Dato av avskrivninger"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "Eiendeler som er kjøpt i inneværende måned"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Beregn"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Søk eiendel Kategori"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "eiendel.avskrivninger.bekreftelse.veiviseren"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Lukket eiendel"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "State av eiendel."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Avskrivninger Navn"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Historie"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Genrelt"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "Gjennomgå eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Avskrivningsmetode"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Kjøpsdato"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+"Velg den perioden du ønsker å automatisk legge inn avskrivninger linjer av "
+"kjører eiendeler."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Beløp å avskrive"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Hopp over Utkast stat"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "Avskrivninger datoer"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "Beløp Allerede Avskrives"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Lagt inn"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+"Når en eiendel er opprettet, er staten \"Kladd\".\n"
+"Dersom eiendelen er bekreftet, går staten i 'Running' og avskrivninger "
+"linjer kan bli lagt i regnskapssystemet.\n"
+"Du kan manuelt lukke et aktivum når avskrivningen er over. Hvis den siste "
+"linjen av avskrivninger er lagt ut, går eiendelen automatisk i den "
+"tilstanden."
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Sjekk dette hvis du ønsker å automatisk bekrefte eiendeler i denne "
+"kategorien når laget av fakturaer."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sett som utkast"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineær"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "Måned-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Eiendel avskrinings linje"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "Eiendeler som er kjøpt i forrige måned."
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Opprettet eiendel trekk."
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+"Fra denne rapporten, kan du ha en oversikt over alle avskrivninger. "
+"Verktøyet søk kan også brukes til å tilpasse dine eiendeler rapporter og så "
+"matche denne analysen til dine behov;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Angi tiden mellom to avskrivninger, i måneder"
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Antall Avskrivninger"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr "Innlegg Avskrivninger linjer"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Bekreft eiendel"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "Eiendel Hierarki."
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "Eiendel lengder å endre"
+
+#~ msgid "Analytic information"
+#~ msgstr "analytisk informasjon"
+
+#~ msgid "Accounting information"
+#~ msgstr "Regnskapsopplysninger"

addons/account_bank_statement_extensions/i18n/nb.po

@@ -0,0 +1,382 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-28 12:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Søk Bank Transaksjon"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "overordnede kode"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Avbryt valgte setning linjer"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Uttalelse"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Bank erklæring Balanserer Rapporter"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Avbryt linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Satsvis Betalingsinformasjon"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Bekreft linjer."
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Slett operasjonen ikke tillatt! Vennligst gå til den tilknyttede "
+"kontoutskrift for å slette og / eller endre denne kontoutskrift linjen."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Bekreftet erklæring linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Kreditt transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Avbryte utvalgte uttalelse linjer."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Motpart nummer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transaksjoner"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "glob Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Debet transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Bekreftet samband kan ikke lenger endres."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Valuta dato"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil avbryte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manuell"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Konto"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Motpart Valuta"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "Motpart BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Underordnet kode"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil bekrefte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"Mengden av bilaget må være det samme beløp som den på setningen linje"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Kode for å identifisere transaksjoner tilhører samme globalisering nivå "
+"innenfor en batch betaling"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Utkast linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob.Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Kode"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Motpartens navn"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Kommunikasjon"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Kontoutskrift"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "erklæring Linje"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Koden må være unik!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Kontoutskrift linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Underholdene Batch Betalinger."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Erklæring linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Totalt beløp"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalisering ID"

addons/account_sequence/i18n/zh_TW.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_sequence

addons/account_voucher/i18n/zh_TW.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:26+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: account_voucher

addons/anonymization/i18n/nb.po

@@ -0,0 +1,213 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-28 12:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.modell.felt.anonymisere.veiviseren"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Felt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importer"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.modell.felt.anonymisering"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Retning"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonymiserte Felter"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "klar -> anonymiseres"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymiseres"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "filbane"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Eksporter"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Reversere Database anonymisering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "anonymisere database"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Felter"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "fjerne"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Oppsummering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonymisert Felt"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Ustabil"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "unntak oppstod"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Eksisterer ikke"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektnavn"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonymisering Historie"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.modell.felt.anonymisering.historie"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonymisere Database"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Filnavn"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anonymisert -> klart"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Startet"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Beskjed"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Du kan ikke ha to felt med samme navn på samme objekt!"

addons/anonymization/i18n/zh_TW.po

@@ -0,0 +1,213 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-29 03:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "欄位名稱"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "匯入"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "方向"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "清楚->匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "匿名"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "物件"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "檔案路徑"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "匯出"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "回復資料庫匿名"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "清除"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "不穩定版"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "發生意外狀況"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "不存在"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "物件名稱"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "匿名紀錄"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "檔案名稱"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "匿名->清楚"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "開始"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "訊息"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "在同一個物件不能有二個相同名稱的欄位!"

addons/association/i18n/nb.po

@@ -0,0 +1,144 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "Arrangementsledelse"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Å få ting gjort"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Denne modulen er å skape profil for Tilknyttede."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurasjonsprosess"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Her er spesifikke programmer knyttet til foreningen profil du har valgt."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "tittel"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Hjelper deg å administrere og organisere hendelser."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Spor og styrer ansattes utgifter, og kan automatisk re-faktura klienter "
+"dersom utgiftene prosjekt-relatert."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD er en metode for å effektivt organisere deg selv og dine oppgaver. Denne "
+"modulen integrerer fullt GTD prinsippet med OpenERP prosjektledelse."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Ressurser ledelse"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Tilknytning profilen"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Utgift Sporing"
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr "Tilknytning applikasjon konfigurasjon"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+"Lar deg opprette wikisider og sidegrupper for å holde oversikt over "
+"virksomheten kunnskap og dele den med og mellom de ansatte."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Hjelper deg med å håndtere dine prosjekter og oppgaver ved å spore dem, "
+"generere planer, osv..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "Profil.foreningen.konfigurasjon.installere_moduler_veiviseren"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Arrangementer"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Prosjektledelse"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Konfigurer"

addons/association/i18n/zh_TW.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: association

addons/base_iban/i18n/nb.po

@@ -0,0 +1,95 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-28 13:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:139
+#, python-format
+msgid "This IBAN does not pass the validation check, please verify it"
+msgstr "Dette IBAN passer ikke valideringskontrollen, du bekrefte den."
+
+#. module: base_iban
+#: model:res.partner.bank.type,format_layout:base_iban.bank_iban
+msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
+msgstr "%(bank_navn)s: IBAN %(konto_nummer)s - BIC %(bank_bic)s"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bank_bic"
+msgstr "bank_bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Internasjonal bank kontonummer"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:136
+#, python-format
+msgid ""
+"The IBAN does not seem to be correct. You should have entered something like "
+"this %s"
+msgstr ""
+"IBAN synes ikke å være korrekt. Du bør ha angitt noe sånt som dette% s"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:140
+#, python-format
+msgid "The IBAN is invalid, it should begin with the country code"
+msgstr "IBAN er ugyldig, Det burde begynne med landskode"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Konto"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"

addons/base_tools/i18n/lt.po

@@ -0,0 +1,30 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 13:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr ""
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""

addons/caldav/i18n/zh_TW.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:39+0000\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
 "X-Generator: Launchpad (build 15864)\n"
 
 #. module: caldav

addons/crm_caldav/i18n/zh_TW.po

@@ -0,0 +1,33 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 02:56+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-29 05:05+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "行事曆瀏覽"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "同步行事曆"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "會議"

addons/event/event_view.xml

@@ -244,7 +244,7 @@
                     <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette">
-                        <a type="edit" class="oe_module_icon">
+                        <a type="open" class="oe_module_icon">
                            <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
                            <div class="oe_event_month_year">
                              <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
@@ -253,7 +253,7 @@
                            <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
                         </a>
                         <div class="oe_module_desc">
-                            <h4><a type="edit"><field name="name"/></a></h4>
+                            <h4><a type="open"><field name="name"/></a></h4>
                             <p>
                               <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
                               <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>

addons/event_sale/event_sale_view.xml

@@ -9,7 +9,7 @@
                 <field name="purchase_ok" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                 </field>
-                <field name='supply_method' position='after'>
+                <field name='procure_method' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                 </field>
              </field>

addons/hr/hr_view.xml

@@ -130,11 +130,11 @@
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
                             <div class="oe_employee_image">
-                                <a type="edit"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
+                                <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
                                 <h4>
-                                    <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                    <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                 </h4>
                                 <ul>
                                     <li id="last_login">

addons/mail/mail_alias.py

@@ -161,7 +161,7 @@ class mail_alias(osv.Model):
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
         child_class_model = registry.get(child_model_name)
-        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
+        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
         for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
             alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }

addons/mail/mail_group_view.xml

@@ -25,10 +25,10 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette">
                                 <div class="oe_group_image">
-                                    <a type="edit"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
+                                    <a type="open"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
                                 </div>
                                 <div class="oe_group_details">
-                                    <h4><a type="edit"><field name="name"/></a></h4>
+                                    <h4><a type="open"><field name="name"/></a></h4>
                                     <ul>
                                         <!-- <li><field name="message_follower_count"/> member(s)</li> -->
                                         <li>

addons/mrp/mrp_view.xml

@@ -981,11 +981,21 @@
                </data>
             </field>
         </record>
+		<record id="product_normal_form_supply_view" model="ir.ui.view">
+            <field name="name">product.normal.form.mrp.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//field[@name='procure_method']" position="after">
+            		<field name="supply_method" groups="base.group_user"/>
+            	</xpath>
+            </field>
+        </record>
 
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Bill of Materials"/>

addons/pad/pad.py

@@ -8,6 +8,11 @@ from tools.translate import _
 class pad_common(osv.osv_memory):
     _name = 'pad.common'
     _pad_fields = []
+
+    def pad_content(self, cr, uid, url ,context=None):
+        content = urllib2.urlopen('%s/export/html'%url).read()
+        return content
+
     def pad_generate_url(self, cr, uid, context=None):
         pad_url_template =  self.pool.get('res.users').browse(cr,uid, uid, context).company_id.pad_url_template
         s = string.ascii_uppercase + string.digits
@@ -20,6 +25,13 @@ class pad_common(osv.osv_memory):
         url = pad_url_template % template_vars
         return url
 
+    # TODO
+    # add attribute on columns pad_content_field = 
+    # override default write to load the content at write and store it in the field
+    # reverse engineer protocol to be setHtml without using the api key
+    # override default get to generate urls
+    # override read to generate url and store the content if empty
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}

addons/pad/res_company.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-DEFAULT_PAD_TEMPLATE = 'http://beta.etherpad.org/p/%(db)s-%(model)s-%(salt)s'
+DEFAULT_PAD_TEMPLATE = 'http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s'
+DEFAULT_PAD_TEMPLATE = ''
 
 class company_pad(osv.osv):
     _inherit = 'res.company'

addons/pad/static/src/css/etherpad.css

@@ -1,52 +1,39 @@
-.oe_etherpad_head{
+.oe_pad_head {
     width: 100%;
     display: block;
-    padding-left:3px;
-    cursor:pointer;
+    padding: 4px;
 }
-.oe_etherpad_fullscreen div.oe_etherpad_head .oe_normal {
-    display: none;
+
+.oe_pad_readonly {
+    border: 1px solid #ddd;
+    padding: 8px;
 }
-.oe_etherpad_normal div.oe_etherpad_head .oe_fullscreen {
-    display: none;
-}
-.oe_etherpad_fullscreen {
+
+.oe_pad_fullscreen {
     position: fixed;
     top: 0px;
     left: 0px;
     width: 100%;
     height: 100%;
     background-color: white;
-    z-index:10001 !important;
-}
-.etherpad_default{  
-    width: 100%;
-    height: 450px;
-}
-.oe_etherpad_fullscreen .etherpad_default{  
-    height: 100%
+    z-index: 1000;
 }
 
-.etherpad_body{
-    overflow:hidden;
+.oe_pad_fullscreen .oe_pad_content {
+    height: 100%;
 }
 
-.etherpad_readonly{
-    width: 100%;
-    height: 450px;
-    overflow:auto;    
+.etherpad_readonly ul, .etherpad_readonly ol {
+    margin-before: 1em;
+    margin-after: 1em;
+    margin-start: 0px;
+    margin-end: 0px;
+    padding-start: 40px !important;
 }
-.etherpad_readonly ul,.etherpad_readonly ol{
-    -webkit-margin-before: 1em;
-    -webkit-margin-after: 1em;
-    -webkit-margin-start: 0px;
-    -webkit-margin-end: 0px;
-    -webkit-padding-start: 40px !important;
-}
-.etherpad_readonly ul li{  
+.etherpad_readonly ul li{
     list-style-type: disc;
 }
-.etherpad_readonly ol li{  
+.etherpad_readonly ol li{
     list-style-type: decimal;
 }
 .etherpad_readonly .indent li{

addons/pad/static/src/js/pad.js

@@ -1,32 +1,47 @@
 openerp.pad = function(instance) {
 
-instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
     template: 'FieldPad',
-    initialize_content: function() {
+    start: function() {
+        this._super();
         var self = this;
-        this.$textarea = undefined;
-        this.$el.find('div.oe_etherpad_head').click(function(ev) {
-            self.$el.toggleClass('oe_etherpad_fullscreen').toggleClass('oe_etherpad_normal');
+        this.$el.find('div.oe_pad_head').click(function(ev) {
+            self.$el.toggleClass('oe_pad_fullscreen');
+        });
+        this.on("change:effective_readonly", this, function() {
+            this.render_value();
         });
     },
-    set_value: function(value_) {
-        this._super(value_);
-        this.render_value();
+    set_value: function(val) {
+        var self = this;
+        var _super = self._super;
+        _super.apply(self,[val]);
+        if (val === false || val === "") {
+            self.field_manager.dataset.call('pad_generate_url').then(function(r) {
+                _super.apply(self,[r]);
+                self.render_value();
+            });
+        } else {
+            self.render_value();
+        }
     },
     render_value: function() {
+        console.log("display");
         var self = this;
         var value = this.get('value');
-        if(value !== false) {
-            var url = value.split('\n')[0];
+
+        if (!_.str.startsWith(value, "http")) {
+            self.$('.oe_pad_content').html(instance.web.qweb.render('FieldPad.unconfigured'));
+        } else {
             if (!this.get("effective_readonly")) {
                 var pad_username = this.session.username;
-                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+url+'?showChat=false&userName='+pad_username+'"></iframe>';
-                this.$el.find('div.oe_etherpad_default').html(code);
+                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+pad_username+'"></iframe>';
+                this.$('.oe_pad_content').html(code);
             } else {
-                $.get(url+'/export/html').success(function(data) {
-                    self.$el.html('<div class="etherpad_readonly">'+data+'</div>');
+                $.get(value+'/export/html').success(function(data) {
+                    self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'</div>');
                 }).error(function() {
-                    self.$el.text('Unable to load pad');
+                    self.$('.oe_pad_content').text('Unable to load pad');
                 });
             }
         }

addons/pad/static/src/xml/pad.xml

@@ -2,17 +2,19 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-
 <t t-name="FieldPad">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_text oe_etherpad_normal">
-            <div class="oe_etherpad_head">
-                    <span class="oe_normal">Fullscreen</span>
-                    <span class="oe_fullscreen">Return to Record</span>
-            </div>
-            <div class="oe_etherpad_default" ></div>
+    <div class="oe_form_field_text oe_pad">
+        <div class="oe_pad_head">
+            <span class="oe_pad_switch">Fullscreen</span>
         </div>
-    </t>
+        <div class="oe_pad_content"></div>
+    </div>
+</t>
+<t t-name="FieldPad.unconfigured">
+    Please configure your etherpad server.<br/>
+    OpenERP Entreprise customers may safely use pad.openerp.com as a server using the following template:<br/>
+    <blockquote>
+    http://pad.openerp.com/p/%(db)s-%(model)s-%(salt)s
+    </blockquote>
 </t>
-
 </templates>

addons/pad_project/project_task.py

@@ -9,6 +9,3 @@ class task(osv.osv):
     _columns = {
         'description_pad': fields.char('Description PAD', size=250)
     }
-    _defaults = {
-        'description_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
-    }

addons/point_of_sale/point_of_sale_view.xml

@@ -625,7 +625,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <group name="misc" position="after">
                     <group name="pos" colspan="2" col="2">

addons/portal_hr_employees/hr_employee_view.xml

@@ -38,7 +38,7 @@
                                         </div>
                                         <div class="oe_employee_details">
                                             <h4>
-                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                                <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                             </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>

addons/portal_project_issue/portal_project_issue_view.xml

@@ -18,7 +18,7 @@
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content">
                                     <div>
-                                        <h1><a type="edit"><field name="name"/></a></h1>
+                                        <h1><a type="open"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>
                                         <field name="version_id"/>
                                     </div>

addons/procurement/procurement_view.xml

@@ -286,7 +286,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.orderpoint.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Minimum Stock Rules"/>

addons/product/product.py

@@ -541,7 +541,7 @@ class product_product(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
-        'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
+        'ean13': fields.char('EAN13 Barcode', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),

addons/product/product_view.xml

@@ -86,12 +86,11 @@
                                     </group>
                                     <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user"/>
-                                        <field name="supply_method" groups="base.group_user"/>
+                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
                                     </group>
                                     <group string="Prices">
                                         <field name="list_price"/>
-                                        <field name="cost_method" groups="base.group_user"/>
+                                        <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
@@ -118,28 +117,6 @@
 
                                 </group>
                             </page>
-                            <page string="Procurement &amp; Locations" groups="base.group_user">
-                                <group>
-                                    <group name="delay" string="Delays">
-                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                        <field name="warranty"/>
-                                    </group>
-                                    <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                    </group>
-                                    <group name="misc" string="Miscellaneous">
-                                        <field name="active"/>
-                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    </group>
-                                </group>
-
-                            </page>
-                            <page string="Suppliers" groups="base.group_user">
-                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                            </page>
                             <page string="Descriptions" groups="base.group_user">
                                 <separator string="Description"/>
                                 <field name="description"/>

addons/product/security/product_security.xml

@@ -23,7 +23,12 @@
         <field name="name">Purchase Pricelists</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-
+	
+	<record id="group_costing_method" model="res.groups">
+        <field name="name">Costing Method</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+	
     <record id="group_uom" model="res.groups">
         <field name="name">Manage Multiple Units of Measure</field>
         <field name="category_id" ref="base.module_category_hidden"/>

addons/project/project_view.xml

@@ -239,30 +239,52 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
+                                    <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value"
-                                            name="%(act_project_project_2_project_task_all)d" type="action">
-                                            Tasks(<field name="task_count"/>)</a>
-                                    </div>
-
-                                    <div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
-                                        <div>Deadline</div>
-                                        <div><field name="date"/></div>
-                                    </div>
-                                    <div class="oe_kanban_project_fields oe_kanban_project_progress">
-                                        <div>Progress</div>
-                                        <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
-                                    </div>
-                                    <div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">
-                                        <a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
+                                    <table>
+                                      <tr t-if="record.date.raw_value">
+                                        <th class="oe_kanban_project_fields oe_kanban_project_deadline">Deadline</th>
+                                        <td><field name="date"/></td>
+                                      </tr>
+                                      <tr class="oe_kanban_project_fields oe_kanban_project_progress">
+                                        <th>Progress</th>
+                                        <td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td>
+                                      </tr>
+                                    </table>
                                     <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
+
+                                    <!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>-->
+
+                                    <!--<div class="oe_kanban_project_list">-->
+                                        <!--<a t-if="record.use_tasks.raw_value"-->
+                                            <!--name="%(act_project_project_2_project_task_all)d" type="action">-->
+                                            <!--Tasks(<field name="task_count"/>)</a>-->
+                                    <!--</div>-->
+
+                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">-->
+                                        <!--<div>Deadline</div>-->
+                                        <!--<div><field name="date"/></div>-->
+                                    <!--</div>-->
+                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_progress">-->
+                                        <!--<div>Progress</div>-->
+                                        <!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>-->
+                                    <!--</div>-->
+                                    <!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">-->
+                                        <!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>-->
+                                    <!--</div>-->
+                                    <!--<div class="oe_kanban_project_avatars">-->
+                                        <!--<t t-foreach="record.members.raw_value" t-as="member">-->
+                                            <!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>-->
+                                        <!--</t>-->
+                                    <!--</div>-->
+
                                 </div>
                             </div>
                         </t>

addons/project/static/src/css/project.css

@@ -1,23 +1,41 @@
+.oe_kanban_card {
+  margin: 2px;
+}
+
 .oe_kanban_project {
-    width: 300px;
+    width: 250px;
+    min-height: 160px;
 }
 .oe_kanban_project_list {
-    margin: 8px 0 8px 0;
+    margin: 4px 0;
 }
-/*.oe_kanban_project_list a:not(:first-child):before {
-    content: ' - ';
-}*/
-.oe_kanban_project_fields div {
-    display: inline-block;
-    width: 49%;
-    box-sizing: border-box;
-    padding: 2px 0 2px 0;
+
+.openerp .oe_kanban_content h4 {
+    margin: 0 0 8px;
 }
+
+.oe_kanban_content > table {
+    width: 100%;
+}
+
+.oe_kanban_content > table > th {
+    padding: 0;
+    border-right: 1px solid #DDD;
+    vertical-align: top;
+    font-weight: normal;
+}
+
+.oe_kanban_content > table > td {
+    padding: 2px 0 2px 8px;
+    color: #888;
+}
+
 .oe_kanban_project_fields div:nth-child(odd) {
     border-right: 1px solid #dddddd;
     vertical-align: top;
     padding-right: 8px;
 }
+
 .oe_kanban_project_fields div:nth-child(even) {
     padding-left: 8px;
     color: #888888;
@@ -27,6 +45,7 @@
     padding-top: 1em;
     margin-top: 8px;
 }
+
 .oe_kanban_project_avatars img {
     width: 30px;
     height: 30px;

addons/project_mrp/project_mrp_view.xml

@@ -14,7 +14,7 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
                     <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />

addons/purchase/purchase_view.xml

@@ -554,5 +554,20 @@
                 </xpath>
             </field>
         </record>
+        
+        <!-- Product Suppliers-->
+        
+        <record id="view_product_supplier_inherit" model="ir.ui.view">
+            <field name="name">product.normal.supplier.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@string='Descriptions']" position="before">
+                    <page string="Suppliers" groups="base.group_user">
+                         <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>

addons/purchase/res_config.py

@@ -40,6 +40,9 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
+        'group_costing_method':fields.boolean("compute product cost price based on average cost",
+            implied_group='product.group_costing_method',
+            help="""Allows you to compute product cost price based on average cost."""),
         'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),

addons/purchase/res_config_view.xml

@@ -59,6 +59,10 @@
                                 <field name="group_purchase_delivery_address" class="oe_inline"/>
                                 <label for="group_purchase_delivery_address"/>
                             </div>
+                            <div>
+                                <field name="group_costing_method" class="oe_inline"/>
+                                <label for="group_costing_method"/>
+                            </div>
                             <div name="module_purchase_double_validation">
                                 <field name="module_purchase_double_validation" class="oe_inline"/>
                                 <label for="module_purchase_double_validation"/>

addons/purchase_requisition/purchase_requisition_view.xml

@@ -182,7 +182,7 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
-            <field name="supply_method" position="after">
+            <field name="procure_method" position="before">
                 <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
                 <field name="purchase_requisition"/>
                 </group>

addons/stock/product_view.xml

@@ -50,6 +50,40 @@
                 </page>
             </field>
         </record>
+        
+        <record id="view_normal_procurement_locations_form" model="ir.ui.view">
+            <field name="name">product.normal.procurement.locations.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Procurement &amp; Locations" groups="base.group_user">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="store" groups="stock.group_locations">
+				                        <separator string="Counter-Part Locations Properties" colspan="2"/>
+				                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+				                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+				                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
+				                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+                            </page>
+                </notebook>
+            </field>
+        </record>
 
         <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
@@ -178,10 +212,10 @@
                         <t t-name="kanban-box">
                             <div class="oe_product_vignette">
                                 <div class="oe_product_img">
-                                <a type="edit"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
+                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
                                 </div>
                                 <div class="oe_product_desc">
-                                    <h4><a type="edit"><field name="name"></field></a></h4>
+                                    <h4><a type="open"><field name="name"></field></a></h4>
                                     <ul>
                                         <li t-if="record.code.raw_value">Code: <field name="code"/></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
@@ -210,21 +244,5 @@
             </field>
         </record>
 
-        <record id="view_normal_property_form" model="ir.ui.view">
-            <field name="name">product.normal.stock.property.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <group name="store" position="after">
-                    <group name="store" groups="stock.group_locations">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
-                    </group>
-                </group>
-            </field>
-        </record>
-
     </data>
 </openerp>