[MERGE] 7.0

bzr revid: fme@openerp.com-20130314155944-hhfaoiu31i8716tn
This commit is contained in:
Fabien Meghazi 2013-03-14 16:59:44 +01:00
commit dbfff7d213
56 changed files with 2255 additions and 834 deletions

View File

@ -1150,6 +1150,29 @@ class account_move(osv.osv):
_description = "Account Entry"
_order = 'id desc'
def account_move_prepare(self, cr, uid, journal_id, date=False, ref='', company_id=False, context=None):
'''
Prepares and returns a dictionary of values, ready to be passed to create() based on the parameters received.
'''
if not date:
date = fields.date.today()
period_obj = self.pool.get('account.period')
if not company_id:
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
company_id = user.company_id.id
if context is None:
context = {}
#put the company in context to find the good period
ctx = context.copy()
ctx.update({'company_id': company_id})
return {
'journal_id': journal_id,
'date': date,
'period_id': period_obj.find(cr, uid, date, context=ctx)[0],
'ref': ref,
'company_id': company_id,
}
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
"""
Returns a list of tupples containing id, name, as internally it is called {def name_get}
@ -1858,7 +1881,6 @@ class account_tax(osv.osv):
default.update({'name': name + _(' (Copy)')})
return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)
def get_precision_tax():
def change_digit_tax(cr):
res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-06 13:28+0000\n"
"PO-Revision-Date: 2013-03-13 16:20+0000\n"
"Last-Translator: Numérigraphe <Unknown>\n"
"Language-Team: French <fr@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: 2013-03-08 05:25+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:33+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -323,12 +323,12 @@ msgid ""
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Cliquez pour ajouter un remboursement à un client.\n"
" Cliquez pour ajouter un avoir client.\n"
" </p><p>\n"
" Un remboursement est un document qui crédite une facture\n"
" Un avoir est un document qui crédite une facture\n"
" complètement ou partiellement.\n"
" </p><p>\n"
" Au lieu de créer manuellement un remboursement client, vous\n"
" Au lieu de créer manuellement un avoir client, vous\n"
" pouvez le générer directement depuis la facture client\n"
" correspondante.\n"
" </p>\n"
@ -1317,7 +1317,7 @@ msgstr "Début de période"
#. module: account
#: view:account.tax:0
msgid "Refunds"
msgstr "Remboursements"
msgstr "Avoirs"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-09 08:25+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:07+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-10 05:14+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -27,8 +27,8 @@ msgstr "Системийн төлөлт"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
"Ижил дансууд дээр татварын харгалзаа нь зөвхөн нэг л удаа тодорхойлогдох "
"боломжтой."
"Ижил дансууд дээр дансны санхүүгийн позиц нь зөвхөн нэг л удаа "
"тодорхойлогдох боломжтой."
#. module: account
#: help:account.tax.code,sequence:0
@ -36,13 +36,13 @@ msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
"'Санхүү \\ Тайлан \\ Тайлан үүсгэх \\ Татвар \\ Татварын Тайлан' тайланд "
"дэлгэцийн дарааллыг тодоруул"
"'Нягтлан бодох бүртгэл\\Тайлагнал\\Ерөнхий тайлагнал\\Татварууд\\Татварын "
"Тайлан' тайланд дэлгэцэнд харуулах дэс дарааллыг тогтоох"
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr "Журналын бичилт тулгах"
msgstr "Журналын Бичилт Тулгах"
#. module: account
#: view:account.account:0
@ -65,12 +65,12 @@ msgstr "Үлдэгдэл"
#: code:addons/account/account_bank_statement.py:368
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr "Журналын \"%s\" гэсэн зүйл зөв биү."
msgstr "\"%s\" гэсэн журналын зүйл нь зөв биш."
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr "Өнөөдрийг хүртэлх авлагын насжилт"
msgstr "Өнөөдрийг хүртэлх төлөгдөөгүй авлага"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@ -720,7 +720,7 @@ msgstr "Одоогийн валютын тохиргоо зөв хийгдээг
#. module: account
#: field:account.journal,profit_account_id:0
msgid "Profit Account"
msgstr "Орлогын данс"
msgstr "Ашгийн Данс"
#. module: account
#: code:addons/account/account_move_line.py:1159

View File

@ -131,10 +131,10 @@
</table>
<group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
<p class="oe_grey oe_edit_only" colspan="2">
When invoicing on timesheet, OpenERP uses the
When reinvoicing costs, OpenERP uses the
pricelist of the contract which uses the price
defined on the product related to each employee to
define the customer invoice price rate.
defined on the product related (e.g timesheet
products are defined on each employee).
</p>
<group>
<field name="pricelist_id"

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-27 08:59+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 11:53+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:31+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@ -128,7 +128,7 @@ msgstr "Аналитичко конто"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
msgid "Analytic Distribution"
msgstr ""
msgstr "Аналитичка дистрибуција"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0

View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-01-25 00:13+0000\n"
"PO-Revision-Date: 2013-03-14 02:58+0000\n"
"Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
"Language-Team: Croatian <hr@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: 2013-03-08 05:32+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in draft and open states"
msgstr ""
msgstr "Imovina u stanju 'nacrt' ili 'otvoreno'"
#. module: account_asset
#: field:account.asset.category,method_end:0
@ -105,7 +105,7 @@ msgstr "Postavi na nacrt"
#: 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 ""
msgstr "Analiza Imovine"
#. module: account_asset
#: field:asset.modify,name:0
@ -136,34 +136,34 @@ msgstr "Stavke"
#: view:account.asset.asset:0
#: field:account.asset.asset,depreciation_line_ids:0
msgid "Depreciation Lines"
msgstr ""
msgstr "Stavke amortizacije"
#. module: account_asset
#: help:account.asset.asset,salvage_value:0
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr ""
msgstr "Iznos je koji planirate imati a ne možete amortizirati"
#. module: account_asset
#: help:account.asset.asset,method_period:0
msgid "The amount of time between two depreciations, in months"
msgstr ""
msgstr "Vremenski period između dvije amortizacije , u mjesecima"
#. 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 ""
msgstr "Datum amortizacije"
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You cannot create recursive assets."
msgstr ""
msgstr "Greška! Nije moguće kreirati rekurzivne stavke"
#. module: account_asset
#: field:asset.asset.report,posted_value:0
msgid "Posted Amount"
msgstr ""
msgstr "Proknjiženi iznos"
#. module: account_asset
#: view:account.asset.asset:0
@ -192,19 +192,19 @@ msgstr "Bilješke"
#. module: account_asset
#: field:account.asset.depreciation.line,move_id:0
msgid "Depreciation Entry"
msgstr ""
msgstr "Unos amortizacije"
#. module: account_asset
#: code:addons/account_asset/account_asset.py:82
#, python-format
msgid "Error!"
msgstr ""
msgstr "Greška!"
#. module: account_asset
#: view:asset.asset.report:0
#: field:asset.asset.report,nbr:0
msgid "# of Depreciation Lines"
msgstr ""
msgstr "# stavaka amortizacije"
#. module: account_asset
#: field:account.asset.asset,method_period:0
@ -214,7 +214,7 @@ msgstr "Broj mjeseci u periodu"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in draft state"
msgstr ""
msgstr "Imovina u stavnu nacrta"
#. module: account_asset
#: field:account.asset.asset,method_end:0
@ -227,25 +227,25 @@ msgstr "Do datuma"
#. module: account_asset
#: field:account.asset.asset,code:0
msgid "Reference"
msgstr ""
msgstr "Veza"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Account Asset"
msgstr ""
msgstr "Konto imovine"
#. 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 ""
msgstr "Izračunj imovinu"
#. module: account_asset
#: field:account.asset.category,method_period:0
#: field:account.asset.history,method_period:0
#: field:asset.modify,method_period:0
msgid "Period Length"
msgstr ""
msgstr "Trajanje perioda"
#. module: account_asset
#: selection:account.asset.asset,state:0
@ -257,12 +257,12 @@ msgstr "Nacrt"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of asset purchase"
msgstr ""
msgstr "Datum nabave imovine"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Change Duration"
msgstr ""
msgstr "Promjeni trajanje"
#. module: account_asset
#: help:account.asset.asset,method_number:0
@ -274,7 +274,7 @@ msgstr ""
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic Information"
msgstr ""
msgstr "Analitički podaci"
#. module: account_asset
#: field:account.asset.category,account_analytic_id:0
@ -297,19 +297,19 @@ msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,remaining_value:0
msgid "Next Period Depreciation"
msgstr ""
msgstr "Sljedeći period amortizacije"
#. module: account_asset
#: help:account.asset.history,method_period:0
msgid "Time in month between two depreciations"
msgstr ""
msgstr "Vrijeme u mjesecima između dvije amortizacije"
#. 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 ""
msgstr "Uredi imovinu"
#. module: account_asset
#: field:account.asset.asset,salvage_value:0
@ -327,12 +327,12 @@ msgstr "Kategorija DI"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in closed state"
msgstr ""
msgstr "Imovina sa statusom 'zatvoreno'"
#. module: account_asset
#: field:account.asset.asset,parent_id:0
msgid "Parent Asset"
msgstr ""
msgstr "Nadređena imovina"
#. module: account_asset
#: view:account.asset.history:0
@ -343,40 +343,40 @@ msgstr "Povijest DI"
#. module: account_asset
#: view:account.asset.category:0
msgid "Search Asset Category"
msgstr ""
msgstr "Pretraži kategoriju imovine"
#. module: account_asset
#: view:asset.modify:0
msgid "months"
msgstr ""
msgstr "mjeseci"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
msgstr "Stavka računa"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Depreciation Board"
msgstr ""
msgstr "Tabla Amortizacija"
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
msgid "Unposted Amount"
msgstr ""
msgstr "Neproknjiženi iznos"
#. 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 ""
msgstr "Vremenska metoda"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
#: view:asset.modify:0
msgid "or"
msgstr ""
msgstr "ili"
#. module: account_asset
#: field:account.asset.asset,note:0
@ -431,7 +431,7 @@ msgstr ""
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
msgstr ""
msgstr "Status"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
@ -442,17 +442,17 @@ msgstr "Partner"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
msgstr ""
msgstr "Proknjižene stavke amortizacije"
#. module: account_asset
#: field:account.asset.asset,child_ids:0
msgid "Children Assets"
msgstr ""
msgstr "Podređena imovina"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of depreciation"
msgstr ""
msgstr "Datum amortizacije"
#. module: account_asset
#: field:account.asset.history,user_id:0
@ -467,18 +467,18 @@ msgstr "Konto sredstva"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Extended Filters..."
msgstr ""
msgstr "Prošireni filteri..."
#. module: account_asset
#: view:account.asset.asset:0
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute"
msgstr ""
msgstr "Izračunaj"
#. module: account_asset
#: view:account.asset.history:0
msgid "Asset History"
msgstr ""
msgstr "Povijest imovine"
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
@ -493,12 +493,12 @@ msgstr "Aktivno"
#. module: account_asset
#: field:account.asset.depreciation.line,parent_state:0
msgid "State of Asset"
msgstr ""
msgstr "Stanje imovine"
#. module: account_asset
#: field:account.asset.depreciation.line,name:0
msgid "Depreciation Name"
msgstr ""
msgstr "Naziv amortizacije"
#. module: account_asset
#: view:account.asset.asset:0
@ -509,7 +509,7 @@ msgstr "Povijest"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute Asset"
msgstr ""
msgstr "Izračunaj imovinu"
#. module: account_asset
#: field:asset.depreciation.confirmation.wizard,period_id:0
@ -519,7 +519,7 @@ msgstr "Razdoblje"
#. module: account_asset
#: view:account.asset.asset:0
msgid "General"
msgstr ""
msgstr "Općenito"
#. module: account_asset
#: field:account.asset.asset,prorata:0
@ -535,7 +535,7 @@ msgstr "Račun"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Close"
msgstr ""
msgstr "Postavi na Zatvoreno"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
@ -552,7 +552,7 @@ msgstr "Zatvori"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_move_line
msgid "Journal Items"
msgstr ""
msgstr "Stavke dnevnika"
#. module: account_asset
#: view:asset.modify:0
@ -564,7 +564,7 @@ msgstr ""
#: view:asset.asset.report:0
#: field:asset.asset.report,purchase_date:0
msgid "Purchase Date"
msgstr ""
msgstr "Datum nabave"
#. module: account_asset
#: selection:account.asset.asset,method:0
@ -582,7 +582,7 @@ msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Current"
msgstr ""
msgstr "Trenutno"
#. module: account_asset
#: code:addons/account_asset/account_asset.py:82
@ -593,32 +593,32 @@ msgstr ""
#. module: account_asset
#: view:account.asset.category:0
msgid "Depreciation Method"
msgstr ""
msgstr "Metoda amortizacije"
#. module: account_asset
#: field:account.asset.depreciation.line,amount:0
msgid "Current Depreciation"
msgstr ""
msgstr "Trenutna amortizacija"
#. module: account_asset
#: field:account.asset.asset,name:0
msgid "Asset Name"
msgstr ""
msgstr "Naziv imovine"
#. module: account_asset
#: field:account.asset.category,open_asset:0
msgid "Skip Draft State"
msgstr ""
msgstr "Preskoči stanje nacrta"
#. module: account_asset
#: view:account.asset.category:0
msgid "Depreciation Dates"
msgstr ""
msgstr "Datumi amortizacije"
#. module: account_asset
#: field:account.asset.asset,currency_id:0
msgid "Currency"
msgstr ""
msgstr "Valuta"
#. module: account_asset
#: field:account.asset.category,journal_id:0
@ -633,7 +633,7 @@ msgstr "Naziv"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciated_value:0
msgid "Amount Already Depreciated"
msgstr ""
msgstr "Iznos je već amortiziran"
#. module: account_asset
#: help:account.asset.asset,method:0
@ -649,7 +649,7 @@ msgstr ""
#: view:asset.asset.report:0
#: field:asset.asset.report,move_check:0
msgid "Posted"
msgstr ""
msgstr "Proknjiženo"
#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@ -672,7 +672,7 @@ msgstr ""
#. module: account_asset
#: field:account.asset.category,name:0
msgid "Name"
msgstr ""
msgstr "Naziv"
#. module: account_asset
#: help:account.asset.category,open_asset:0
@ -684,12 +684,12 @@ msgstr ""
#. module: account_asset
#: field:asset.asset.report,name:0
msgid "Year"
msgstr ""
msgstr "Godina"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
msgid "Asset depreciation line"
msgstr ""
msgstr "Stavka amortizacije imovine"
#. module: account_asset
#: view:account.asset.category:0
@ -702,18 +702,18 @@ msgstr "Kategorija DI"
#: view:asset.asset.report:0
#: field:asset.asset.report,depreciation_value:0
msgid "Amount of Depreciation Lines"
msgstr ""
msgstr "Iznos stavaka amortizacije"
#. module: account_asset
#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
#, python-format
msgid "Created Asset Moves"
msgstr ""
msgstr "Stvorena knjiženja imovine"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Add an internal note here..."
msgstr ""
msgstr "Dodaj internu bilješku ovdje..."
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
@ -723,7 +723,7 @@ msgstr "Brojčana serija"
#. module: account_asset
#: help:account.asset.category,method_period:0
msgid "State here the time between 2 depreciations, in months"
msgstr ""
msgstr "Ovdje navedite vrijeme izmežu dvije amortizacije, u mjesecima"
#. module: account_asset
#: field:account.asset.history,date:0
@ -739,7 +739,7 @@ msgstr "Datum"
#: selection:account.asset.history,method_time:0
#: field:asset.modify,method_number:0
msgid "Number of Depreciations"
msgstr ""
msgstr "Broj amortizacija"
#. module: account_asset
#: view:account.asset.asset:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-15 15:53+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:05+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 05:32+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_asset
#: view:account.asset.asset:0
@ -200,7 +200,7 @@ msgstr "Элэгдлийн Бичилт"
#: code:addons/account_asset/account_asset.py:82
#, python-format
msgid "Error!"
msgstr ""
msgstr "Алдаа!"
#. module: account_asset
#: view:asset.asset.report:0
@ -608,7 +608,7 @@ msgstr "Одоогийн"
#: code:addons/account_asset/account_asset.py:82
#, python-format
msgid "You cannot delete an asset that contains posted depreciation lines."
msgstr ""
msgstr "Элэгдэл бодогдсон хөрөнгүүдийг устгах боломжгүй."
#. module: account_asset
#: view:account.asset.category:0
@ -743,7 +743,7 @@ msgstr "Үүсгэгдсэн Хөрөнгийн Хөдөлгөөнүүд"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Add an internal note here..."
msgstr ""
msgstr "Дотоод тэмдэглэлийг энд бичиж болдог."
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-11 11:18+0000\n"
"PO-Revision-Date: 2013-03-13 08:18+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-12 05:18+0000\n"
"X-Generator: Launchpad (build 16524)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@ -185,7 +185,7 @@ msgstr "Завршено"
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Practical Amt"
msgstr ""
msgstr "Реален износ"
#. module: account_budget
#: view:account.analytic.account:0
@ -193,7 +193,7 @@ msgstr ""
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,practical_amount:0
msgid "Practical Amount"
msgstr ""
msgstr "Реален износ"
#. module: account_budget
#: field:crossovered.budget,date_to:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-02 10:01+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:09+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 05:32+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@ -344,7 +344,7 @@ msgstr "эсвэл"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Cancel Budget"
msgstr ""
msgstr "Төсөв Цуцлах"
#. module: account_budget
#: report:account.budget:0

View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2013-03-13 10:08+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 05:32+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_cancel
#: view:account.invoice:0
msgid "Cancel Invoice"
msgstr ""
msgstr "Нэхэмжлэл Цуцлах"
#~ msgid "Cancel"
#~ msgstr "Цуцлах"

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-07 01:14+0000\n"
"PO-Revision-Date: 2013-03-13 14:10+0000\n"
"Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
"Language-Team: Slovenian <sl@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: 2013-03-08 05:33+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: account_followup
#: model:email.template,subject:account_followup.email_template_account_followup_default
@ -106,7 +106,7 @@ msgstr "Koraki iztrjave"
#: code:addons/account_followup/account_followup.py:262
#, python-format
msgid "Due Date"
msgstr ""
msgstr "Datum zapadlosti"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@ -119,7 +119,7 @@ msgstr "Pošlji opomine"
#: code:addons/account_followup/report/account_followup_print.py:86
#, python-format
msgid "Error!"
msgstr ""
msgstr "Napaka!"
#. module: account_followup
#: report:account_followup.followup.print:0
@ -240,7 +240,7 @@ msgstr ""
#: code:addons/account_followup/account_followup.py:261
#, python-format
msgid "Reference"
msgstr ""
msgstr "Sklic"
#. module: account_followup
#: view:account_followup.stat.by.partner:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-02 10:13+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 11:54+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:34+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: account_voucher
@ -145,7 +145,7 @@ msgstr ""
#. module: account_voucher
#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
msgid "Status changed"
msgstr ""
msgstr "Статусот е променет"
#. module: account_voucher
#: view:account.voucher:0
@ -258,7 +258,7 @@ msgstr "Опции за плаќање"
#. module: account_voucher
#: view:account.voucher:0
msgid "e.g. 003/10"
msgstr ""
msgstr "на пр. 003/10"
#. module: account_voucher
#: view:account.voucher:0
@ -378,7 +378,7 @@ msgstr "Импортирај фактури"
#. module: account_voucher
#: view:account.voucher:0
msgid "e.g. Invoice SAJ/0042"
msgstr ""
msgstr "на пр. Фактура SAJ/0042"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:1112
@ -419,7 +419,7 @@ msgstr "Линии за продажба"
#. module: account_voucher
#: view:account.voucher:0
msgid "Cancel Voucher"
msgstr ""
msgstr "Откажи го ваучерот"
#. module: account_voucher
#: view:account.voucher:0

View File

@ -10,14 +10,14 @@ msgstr ""
"Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
"macedonian@lists.launchpad.net>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-04 14:38+0000\n"
"PO-Revision-Date: 2013-03-13 11:50+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: ESKON Inzenering\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-03-08 05:34+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: analytic
@ -39,7 +39,7 @@ msgstr "Договор: "
#. module: analytic
#: model:mail.message.subtype,description:analytic.mt_account_pending
msgid "Contract pending"
msgstr ""
msgstr "Договор во очекување"
#. module: analytic
#: selection:account.analytic.account,state:0
@ -148,7 +148,7 @@ msgstr "Опис"
#: code:addons/analytic/analytic.py:262
#, python-format
msgid "Quick account creation disallowed."
msgstr ""
msgstr "Брзо креирање на сметка не е дозволено"
#. module: analytic
#: field:account.analytic.account,message_unread:0
@ -347,7 +347,7 @@ msgstr "Биланс"
#. module: analytic
#: field:account.analytic.account,complete_name:0
msgid "Full Name"
msgstr ""
msgstr "Цело име"
#. module: analytic
#: selection:account.analytic.account,state:0
@ -379,7 +379,7 @@ msgstr "Грешка!"
#. module: analytic
#: model:mail.message.subtype,description:analytic.mt_account_closed
msgid "Contract closed"
msgstr ""
msgstr "Договорот е затворен"
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
@ -407,13 +407,13 @@ msgstr "Валута"
#. module: analytic
#: model:mail.message.subtype,description:analytic.mt_account_opened
msgid "Contract opened"
msgstr ""
msgstr "Договорот е отворен"
#. module: analytic
#: code:addons/analytic/analytic.py:262
#, python-format
msgid "Warning"
msgstr ""
msgstr "Внимание"
#. module: analytic
#: field:account.analytic.account,type:0

View File

@ -40,6 +40,16 @@
</td>
</tr>
</xpath>
<xpath expr="//group[@name='invoice_on_timesheets']" position="attributes">
<attribute name="attrs">{'invisible': [('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}</attribute>
</xpath>
<xpath expr="//field[@name='pricelist_id']" position="attributes">
<attribute name="attrs">{'required': ['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
</xpath>
<xpath expr="//field[@name='to_invoice']" position="attributes">
<attribute name="attrs">{'required': ['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
<attribute name="string">Expenses and Timesheet Invoicing Ratio</attribute>
</xpath>
</field>
</record>

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-01 14:17+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 08:05+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:34+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: analytic_contract_hr_expense
#: view:account.analytic.account:0
@ -41,7 +41,7 @@ msgstr "Аналитичко конто"
#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
#, python-format
msgid "Expenses to Invoice of %s"
msgstr ""
msgstr "Трошоци за фактурирање од %s"
#. module: analytic_contract_hr_expense
#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
@ -64,7 +64,7 @@ msgstr "Проценка на трошоци за фактурирање"
#. module: analytic_contract_hr_expense
#: field:account.analytic.account,charge_expenses:0
msgid "Charge Expenses"
msgstr ""
msgstr "Наплати трошоци"
#. module: analytic_contract_hr_expense
#: view:account.analytic.account:0

View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-07 14:34+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 08:07+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:34+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
msgstr "Аналитичка ставка"
#. module: analytic_user_function
#: view:account.analytic.account:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-11 11:20+0000\n"
"PO-Revision-Date: 2013-03-13 08:22+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-12 05:18+0000\n"
"X-Generator: Launchpad (build 16524)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: auth_ldap
#: field:res.company.ldap,user:0
@ -42,7 +42,7 @@ msgstr "LDAP конфигурација"
#. module: auth_ldap
#: field:res.company.ldap,ldap_binddn:0
msgid "LDAP binddn"
msgstr ""
msgstr "LDAP спојување"
#. module: auth_ldap
#: field:res.company.ldap,company:0
@ -91,7 +91,7 @@ msgstr "Компании"
#. module: auth_ldap
#: view:res.company.ldap:0
msgid "Process Parameter"
msgstr ""
msgstr "Параметар за процесот"
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_company_ldap
@ -101,7 +101,7 @@ msgstr "res.company.ldap"
#. module: auth_ldap
#: help:res.company.ldap,user:0
msgid "User to copy when creating new users"
msgstr ""
msgstr "Корисник за копирање при креирање на нови корисници"
#. module: auth_ldap
#: field:res.company.ldap,ldap_tls:0
@ -140,6 +140,8 @@ msgid ""
"The password of the user account on the LDAP server that is used to query "
"the directory."
msgstr ""
"Лозинката на корисничката сметка на LDAP серверот што се користи за "
"пребарување на директориумот."
#. module: auth_ldap
#: help:res.company.ldap,ldap_binddn:0
@ -147,6 +149,8 @@ msgid ""
"The user account on the LDAP server that is used to query the directory. "
"Leave empty to connect anonymously."
msgstr ""
"Корисничката сметка на LDAP серверот што се користи за пребарување на "
"директориумот. За анонимно поврзување, оставете празно."
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_users

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-28 15:03+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 11:47+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:35+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: auth_openid
#. openerp-web
@ -58,7 +58,7 @@ msgstr "Launchpad"
#. module: auth_openid
#: help:res.users,openid_email:0
msgid "Used for disambiguation in case of a shared OpenID URL"
msgstr ""
msgstr "Се користи за појаснување во случај на заедничка OpenID адреса"
#. module: auth_openid
#. openerp-web
@ -89,7 +89,7 @@ msgstr "Лозинка"
#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
#, python-format
msgid "Google Apps"
msgstr ""
msgstr "Google Apps"
#. module: auth_openid
#: model:ir.model,name:auth_openid.model_res_users

View File

@ -1,25 +1,15 @@
.login .pane {
width: 260px;
height: 175px;
}
.login .pane input[name='openid_url'] {
.oe_login .oe_login_pane input[name='openid_url'] {
background: #fff url(../img/login-bg.gif) no-repeat 1px;
padding-left: 20px;
}
.auth_choice {
position: static;
display: none;
.openerp .oe_login .openid_providers {
text-align: center;
}
.openid_providers {
padding: 0;
list-style: none;
float: right;
.openerp .oe_login .openid_providers ul {
display: inline-block;
}
.openid_providers li {
.openerp .oe_login .openid_providers ul li {
display: block;
float: left;
margin: 0 1px 3px 2px;
@ -29,7 +19,6 @@
display: block;
width: 24px;
height: 24px;
border: 1px solid #ddd;
background: #fff url(../img/openid_16.png) no-repeat 50%;
text-indent: -9999px;
overflow: hidden;
@ -37,20 +26,16 @@
}
.openid_providers a.selected {
border-color: #9A0404;
background-color: #DC5F59;
}
.openid_providers a[title="Password"] { background-image: url(../img/textfield_key.png); }
.openid_providers a[title="AOL"] { background-image: url(../img/aol.png); }
.openid_providers a[title="ClaimID"] { background-image: url(../img/claimid.png); }
.openid_providers a[title="Google"] { background-image: url(../img/googlefav.png); }
.openid_providers a[title="Google Apps"] { background-image: url(../img/marketplace.gif); }
.openid_providers a[title="MyOpenID"] { background-image: url(../img/myopenid.png); }
.openid_providers a[title="VeriSign"] { background-image: url(../img/verisign.png); }
.openid_providers a[title="Yahoo!"] { background-image: url(../img/yahoo.png); }
.openid_providers a[title="Launchpad"] { background-image: url(../img/launchpad.png); }
.openid_providers a[data-provider="Password"] { background-image: url(../img/textfield_key.png); }
.openid_providers a[data-provider="AOL"] { background-image: url(../img/aol.png); }
.openid_providers a[data-provider="ClaimID"] { background-image: url(../img/claimid.png); }
.openid_providers a[data-provider="Google"] { background-image: url(../img/googlefav.png); }
.openid_providers a[data-provider="Google Apps"] { background-image: url(../img/marketplace.gif); }
.openid_providers a[data-provider="MyOpenID"] { background-image: url(../img/myopenid.png); }
.openid_providers a[data-provider="VeriSign"] { background-image: url(../img/verisign.png); }
.openid_providers a[data-provider="Yahoo!"] { background-image: url(../img/yahoo.png); }
.openid_providers a[data-provider="Launchpad"] { background-image: url(../img/launchpad.png); }
li.auth_choice.selected {
display: table-row;
}

View File

@ -14,6 +14,16 @@ instance.web.Login = instance.web.Login.extend({
self.$openid_selected_input = $();
self.$openid_selected_provider = null;
// Hook auth_signup events. noop if module is not installed.
self.on('change:login_mode', self, function() {
var mode = self.get('login_mode') || 'default';
if (mode !== 'default') {
return;
}
self.do_openid_select(self.$openid_selected_button, self.$openid_selected_provider, true);
});
var openIdProvider = null;
if (self.has_local_storage && self.remember_credentials) {
@ -21,12 +31,10 @@ instance.web.Login = instance.web.Login.extend({
}
if (openIdProvider) {
$openid_selected_provider = openIdProvider;
self.$openid_selected_provider = openIdProvider;
self.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true);
if (self.has_local_storage && self.remember_credentials) {
self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login'));
}
self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login') || '');
}
else {
self.do_openid_select('a[data-url=""]', 'login,password', true);
@ -49,11 +57,12 @@ instance.web.Login = instance.web.Login.extend({
do_openid_select: function (button, provider, noautosubmit) {
var self = this;
self.$('li[data-provider]').hide();
self.$openid_selected_button.add(self.$openid_selected_input).removeClass('selected');
self.$openid_selected_button = self.$el.find(button).addClass('selected');
var input = _(provider.split(',')).map(function(p) { return 'li[data-provider="'+p+'"]'; }).join(',');
self.$openid_selected_input = self.$el.find(input).addClass('selected');
self.$openid_selected_input = self.$el.find(input).show();
self.$openid_selected_input.find('input:first').focus();
self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1);
@ -62,7 +71,7 @@ instance.web.Login = instance.web.Login.extend({
localStorage.setItem('openid-provider', self.$openid_selected_provider);
}
if (!noautosubmit && self.$openid_selected_input.length == 0) {
if (!noautosubmit && self.$openid_selected_input.length === 0) {
self.$el.find('form').submit();
}

View File

@ -4,44 +4,53 @@
<t t-extend="Login">
<t t-jquery=".oe_login .oe_login_logo" t-operation="after">
<ul class="openid_providers oe_semantic_html_override">
<li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
<li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
<li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
<li><a href="#launchpad" title="Launchpad" data-url="https://launchpad.net/~{id}">Launchpad</a></li>
<li><a href="#openid_url" title="OpenID" data-url="{id}">OpenID</a></li>
</ul>
<div class="openid_providers" data-modes="default openid"><ul>
<li><a href="#login,password" data-provider='Password' title="Password" data-url="" id="btn_password">Password</a></li>
<li><a href="#google" data-provider='Google' title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
<li><a href="#googleapps" data-provider='Google Apps' title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
<li><a href="#launchpad" data-provider='Launchpad' title="Launchpad" data-url="https://launchpad.net/~{id}">Launchpad</a></li>
<li><a href="#openid_url" data-provider='OpenID' title="OpenID" data-url="{id}">OpenID</a></li>
</ul></div>
</t>
</t>
<t t-extend="Login">
<t t-jquery=".oe_login .oe_login_pane form ul li:nth-child(4)" t-operation="after">
<li>
<t t-jquery=".oe_login .oe_login_pane form ul li:last-child()" t-operation="before">
<li data-modes="openid" data-provider='googleapps'>
Google Apps Domain
</li>
<li>
<li data-modes="openid" data-provider='googleapps'>
<input type="text" name="googleapps" />
</li>
<li>
<li data-modes="openid" data-provider='launchpad'>
Username
</li>
<li>
<li data-modes="openid" data-provider='launchpad'>
<input type="text" name="launchpad" />
</li>
<li>
<li data-modes="openid" data-provider='openid_url'>
OpenID URL
</li>
<li>
<li data-modes="openid" data-provider='openid_url'>
<input type="text" name="openid_url" />
</li>
</t>
</t>
<t t-extend="Login">
<t t-jquery=".oe_login .oe_login_pane form ul li:has(input)">
<t t-jquery=".oe_login .oe_login_pane form ul li:has(input[name=password])">
this.each(function() {
var $i = $(this);
$i.add($i.prev()).attr('data-provider', 'password');
});
</t>
<t t-jquery=".oe_login .oe_login_pane form ul li:has(input[name=login])">
this.each(function() {
var $i = $(this),
dp = $i.find('input').attr('name');
$i.add($i.prev()).attr('class', 'auth_choice').attr('data-provider', dp);
dp = $i.find('input').attr('name'),
$p = $i.prev();
// $p may not be the correct label when auth_signup is installed.
while(($p.attr('data-modes') || 'default') !== 'default') { $p = $p.prev(); }
$i.add($p).attr('data-provider', dp);
});
</t>
</t>

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-26 19:07+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 08:11+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: ESKON-INZENERING <mk@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: 2013-03-08 05:35+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: auth_signup
@ -167,6 +167,35 @@ msgid ""
" \n"
" "
msgstr ""
"\n"
" \n"
" <p>\n"
" ${object.name},\n"
" </p>\n"
" <p>\n"
" Поканети сте да се поврзете на "
"\"${object.company_id.name}\" за да добиете пристап до вашите документи во "
"OpenERP.\n"
" </p>\n"
" <p>\n"
" За да ја прифатите пораката, кликнете на следниот "
"линк:\n"
" </p>\n"
" <ul>\n"
" <li><a href=\"${object.signup_url}\">Прифати ја "
"поканата за \"${object.company_id.name}\"</a></li>\n"
" </ul>\n"
" <p>\n"
" Ви Благодариме,\n"
" </p>\n"
" <pre>\n"
"--\n"
"${object.company_id.name or ''}\n"
"${object.company_id.email or ''}\n"
"${object.company_id.phone or ''}\n"
" </pre>\n"
" \n"
" "
#. module: auth_signup
#. openerp-web
@ -195,7 +224,7 @@ msgstr ""
#: code:addons/auth_signup/static/src/js/auth_signup.js:174
#, python-format
msgid "An email has been sent with credentials to reset your password"
msgstr ""
msgstr "Пратен е e-mail со креденции за ресетирање на вашата лозинка"
#. module: auth_signup
#. openerp-web
@ -297,7 +326,7 @@ msgstr "Дозволи ресетирање на лозинка од стран
#. module: auth_signup
#: model:email.template,subject:auth_signup.set_password_email
msgid "${object.company_id.name} invitation to connect on OpenERP"
msgstr ""
msgstr "${object.company_id.name} покана за поврзување на OpenERP"
#. module: auth_signup
#. openerp-web
@ -314,7 +343,7 @@ msgstr "Партнер"
#. module: auth_signup
#: view:res.users:0
msgid "Send reset password instructions by email"
msgstr ""
msgstr "Инструкциите за ресетирање на лозинка испрати ги на e-mail"
#. module: auth_signup
#: field:res.partner,signup_token:0

View File

@ -168,7 +168,7 @@ class res_users(osv.Model):
_columns = {
'state': fields.function(_get_state, string='Status', type='selection',
selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]),
selection=[('new', 'Never Connected'), ('active', 'Activated'), ('reset', 'Invitation Pending')]),
}
def signup(self, cr, uid, values, token=None, context=None):

View File

@ -56,7 +56,7 @@ openerp.auth_signup = function(instance) {
self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) {
self.signup_enabled = result.signup;
self.reset_password_enabled = result.reset_password;
if (self.$("form input[name=login]").val()){
if (!self.signup_enabled || self.$("form input[name=login]").val()){
self.set('login_mode', 'default');
} else {
self.set('login_mode', 'signup');

View File

@ -12,6 +12,9 @@
<li data-modes="default">Username</li>
<li data-modes="signup reset">Username (Email)</li>
</t>
<t t-jquery="form ul:first li:has(input[name=login], input[name=password]), form ul:first li:contains('Password')">
this.attr('data-modes', 'default signup reset');
</t>
<t t-jquery="form ul:first li:has(input[name=password])" t-operation="after">
<li data-modes="signup reset">Confirm Password</li>
<li data-modes="signup reset"><input name="confirm_password" type="password"/></li>

View File

@ -9,15 +9,15 @@ msgstr ""
"Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
"macedonian@lists.launchpad.net >\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-02 16:57+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 12:20+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: OpenERP Macedonia <openerp-i18n-"
"macedonian@lists.launchpad.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-03-08 05:35+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: base_action_rule
@ -255,7 +255,7 @@ msgstr "Минути"
#. module: base_action_rule
#: field:base.action.rule,model_id:0
msgid "Related Document Model"
msgstr ""
msgstr "Поврзан модел на документ"
#. module: base_action_rule
#: help:base.action.rule,filter_pre_id:0
@ -314,9 +314,9 @@ msgstr "Датум на активирање"
#: view:base.action.rule:0
#: field:base.action.rule,server_action_ids:0
msgid "Server Actions"
msgstr ""
msgstr "Дејства на серверот"
#. module: base_action_rule
#: field:base.action.rule.lead.test,name:0
msgid "Subject"
msgstr ""
msgstr "Тема"

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-08 15:35+0000\n"
"PO-Revision-Date: 2013-03-13 08:00+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-09 05:38+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: base_iban
#: constraint:res.partner.bank:0
@ -52,7 +52,7 @@ msgstr "zip"
#. module: base_iban
#: help:res.partner.bank,iban:0
msgid "International Bank Account Number"
msgstr ""
msgstr "Интернационален број на банкарска сметка"
#. module: base_iban
#: model:ir.model,name:base_iban.model_res_partner_bank

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-06 13:46+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 11:42+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:36+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_base_report_sxw
@ -33,6 +33,8 @@ msgid ""
"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
"Writer."
msgstr ""
"Овој додаток овозможува креирање/модифицирање на OpenERP извештаи во "
"OpenOffice."
#. module: base_report_designer
#: view:base.report.sxw:0
@ -89,7 +91,7 @@ msgstr "Име на датотеката"
#: view:base.report.file.sxw:0
#: view:base.report.sxw:0
msgid "Get a report"
msgstr ""
msgstr "Земи извештај"
#. module: base_report_designer
#: view:base_report_designer.installer:0
@ -113,6 +115,8 @@ msgid ""
"OpenObject Report Designer plug-in file. Save as this file and install this "
"plug-in in OpenOffice."
msgstr ""
"Датотека за додатокот OpenObject Report Designer. Зачувајте ја оваа датотека "
"и инсталирајте го додатокот во OpenOffice."
#. module: base_report_designer
#: view:base.report.rml.save:0
@ -153,7 +157,7 @@ msgstr ""
#. module: base_report_designer
#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
msgid "Base Report sxw"
msgstr ""
msgstr "Основен извештај sxw"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
@ -163,7 +167,7 @@ msgstr "base.report.file.sxw"
#. module: base_report_designer
#: field:base_report_designer.installer,plugin_file:0
msgid "OpenObject Report Designer Plug-in"
msgstr ""
msgstr "OpenObject Report Designer додаток"
#. module: base_report_designer
#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-07 11:56+0000\n"
"PO-Revision-Date: 2013-03-13 08:04+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:37+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: base_status
#: code:addons/base_status/base_state.py:107
@ -48,6 +48,8 @@ msgid ""
"You can not escalate, you are already at the top level regarding your sales-"
"team category."
msgstr ""
"Неможе да ескалирате, веќе сте на највисокото ниво со оглед на категоријата "
"на вашиот продажбен тим."
#. module: base_status
#: code:addons/base_status/base_state.py:193
@ -68,6 +70,8 @@ msgid ""
"You are already at the top level of your sales-team category.\n"
"Therefore you cannot escalate furthermore."
msgstr ""
"Веќе сте на највисокото ниво на вашиот продажбен тим.\n"
"Значи понатамошно ескалирање не е можно."
#. module: base_status
#: code:addons/base_status/base_state.py:181

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-02-27 09:32+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 08:07+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:37+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: base_vat
#: view:res.partner:0
@ -51,7 +51,7 @@ msgstr "Грешка!"
#. module: base_vat
#: view:res.partner:0
msgid "e.g. BE0477472701"
msgstr ""
msgstr "на пр. BE0477472701"
#. module: base_vat
#: help:res.partner,vat_subjected:0

File diff suppressed because it is too large Load Diff

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-10 22:39+0000\n"
"PO-Revision-Date: 2013-03-13 15:42+0000\n"
"Last-Translator: krnkris <Unknown>\n"
"Language-Team: Hungarian <hu@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: 2013-03-11 05:42+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,delay_close:0
@ -192,7 +192,7 @@ msgid ""
"Gives the probability to assign a lead to this partner. (0 means no "
"assignation.)"
msgstr ""
"A partnerhez kiadható lehetőség valószínűségét adja meg. (A nincs kiadást a "
"A partnerhez kiadható érdeklődés valószínűségét adja meg. (A nincs kiadást a "
"0 jelenti)"
#. module: crm_partner_assign
@ -209,7 +209,7 @@ msgstr "Rendszerüzenet"
#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
#, python-format
msgid "Lead forward"
msgstr "Továbblépés lehetőségről"
msgstr "Továbblépés érdeklődésről"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,probability:0
@ -341,7 +341,7 @@ msgstr "Partner hozzárendelés"
#. module: crm_partner_assign
#: help:crm.lead.report.assign,type:0
msgid "Type is used to separate Leads and Opportunities"
msgstr "A típust az érdeklődők és az esélyek szétválasztására használja"
msgstr "A típust az érdeklődők és a lehetőségek szétválasztására használja"
#. module: crm_partner_assign
#: selection:crm.lead.report.assign,month:0
@ -752,7 +752,7 @@ msgstr "Jelenleg"
#. module: crm_partner_assign
#: model:ir.model,name:crm_partner_assign.model_crm_lead
msgid "Lead/Opportunity"
msgstr "Lehetőség/Esély"
msgstr "Érdeklődő/Lehetőség"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,notified_partner_ids:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-01 12:35+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 08:06+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:40+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: crm_todo
#: model:ir.model,name:crm_todo.model_project_task
@ -30,7 +30,7 @@ msgstr ""
#. module: crm_todo
#: view:crm.lead:0
msgid "Lead"
msgstr ""
msgstr "Водечко"
#. module: crm_todo
#: view:crm.lead:0
@ -72,7 +72,7 @@ msgstr "Lead/Можност"
#. module: crm_todo
#: field:project.task,lead_id:0
msgid "Lead / Opportunity"
msgstr ""
msgstr "Водечко / Можност"
#. module: crm_todo
#: view:crm.lead:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-01 17:59+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 11:53+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:41+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: document_page
#: view:document.page:0
@ -23,13 +23,13 @@ msgstr ""
#: selection:document.page,type:0
#: model:ir.actions.act_window,name:document_page.action_category
msgid "Category"
msgstr ""
msgstr "Категорија"
#. module: document_page
#: view:document.page:0
#: field:document.page,write_uid:0
msgid "Last Contributor"
msgstr ""
msgstr "Последен приложувач"
#. module: document_page
#: view:document.page:0
@ -76,6 +76,8 @@ msgstr "Урнек"
msgid ""
"that will be used as a content template for all new page of this category."
msgstr ""
"што ќе се користи како шаблон за содржината на сите нови страници од оваа "
"категорија"
#. module: document_page
#: field:document.page,name:0
@ -161,7 +163,7 @@ msgstr "Категории"
#. module: document_page
#: view:document.page:0
msgid "Name"
msgstr ""
msgstr "Име"
#. module: document_page
#: field:document.page.create.menu,menu_parent_id:0
@ -193,7 +195,7 @@ msgstr "Резиме"
#. module: document_page
#: view:document.page:0
msgid "e.g. Once upon a time..."
msgstr ""
msgstr "на пр. Еднаш, многу одамна..."
#. module: document_page
#: model:ir.actions.act_window,help:document_page.action_page

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-07 12:30+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 11:42+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:41+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: document_webdav
#: field:document.webdav.dir.property,create_date:0
@ -26,7 +26,7 @@ msgstr "Датумот е креиран"
#. module: document_webdav
#: model:ir.ui.menu,name:document_webdav.menu_document_props
msgid "Documents"
msgstr ""
msgstr "Документи"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@ -37,7 +37,7 @@ msgstr "Сопственост на документ"
#: view:document.webdav.dir.property:0
#: view:document.webdav.file.property:0
msgid "Search Document properties"
msgstr ""
msgstr "Пребарувај ги својствата на документот"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@ -150,7 +150,7 @@ msgstr "Креатор"
#. module: document_webdav
#: view:document.webdav.file.property:0
msgid "Document Property"
msgstr ""
msgstr "Својство на документот"
#. module: document_webdav
#: model:ir.ui.menu,name:document_webdav.menu_properties
@ -161,4 +161,4 @@ msgstr ""
#: field:document.webdav.dir.property,do_subst:0
#: field:document.webdav.file.property,do_subst:0
msgid "Substitute"
msgstr ""
msgstr "Замена"

View File

@ -9,15 +9,15 @@ msgstr ""
"Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
"macedonian@lists.launchpad.net >\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-02 10:12+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 07:59+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: OpenERP Macedonia <openerp-i18n-"
"macedonian@lists.launchpad.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-03-08 05:41+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: email_template
@ -46,7 +46,7 @@ msgstr "Исклучи"
#. module: email_template
#: view:email.template:0
msgid "Email contents (in raw HTML format)"
msgstr ""
msgstr "E-mail содржини (во HTML формат)"
#. module: email_template
#: field:email.template,email_to:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-07 18:51+0000\n"
"PO-Revision-Date: 2013-03-13 18:52+0000\n"
"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
"Language-Team: Romanian <ro@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: 2013-03-08 05:41+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: email_template
#: field:email.template,email_from:0
@ -192,7 +192,7 @@ msgstr ""
"trimiteti un e-mail. Daca nu este setata, va fi folosita versiunea in limba "
"engleza. Aceasta ar trebui de obicei sa fie o expresie inlocuitoare care "
"furnizeaza codul limbii corespunzatoare, de exemplu "
"${obiect.partener_id.cod.limba}."
"${object.partner_id.lang.code}."
#. module: email_template
#: field:email_template.preview,res_id:0
@ -421,7 +421,7 @@ msgstr "Stergerea inregistrarii actiunii a esuat."
#: field:email.template,email_cc:0
#: field:email_template.preview,email_cc:0
msgid "Cc"
msgstr "Cc (copie carbon)"
msgstr "Cc"
#. module: email_template
#: field:email.template,model_id:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-08 15:37+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 12:14+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-09 05:38+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: event
#: view:event.event:0
@ -1129,12 +1129,12 @@ msgstr "Датум на почеток на настан"
#. module: event
#: view:report.event.registration:0
msgid "Participant / Contact"
msgstr ""
msgstr "Учесник / Контакт"
#. module: event
#: view:event.event:0
msgid "Current Registrations"
msgstr ""
msgstr "Моментални запишувања"
#. module: event
#: model:email.template,body_html:event.confirmation_registration
@ -1149,6 +1149,14 @@ msgid ""
" <p>Thank you for your participation!</p>\n"
" <p>Best regards</p>"
msgstr ""
"\n"
" <p>Здраво ${object.name},</p>\n"
" <p>Ви потврдуваме дека вашата регистрација за настанот "
"${object.event_id.name} е запишана.\n"
" Автоматски ќе добиете e-mail со информации (како распоред, дневен "
"ред...) штом ќе се потврди настанот.</p>\n"
" <p>Ви благодариме за учеството!</p>\n"
" <p>Со почит</p>"
#. module: event
#: help:event.event,reply_to:0
@ -1180,7 +1188,7 @@ msgstr "Улица"
#: model:ir.actions.act_window,name:event.action_event_confirm
#: model:ir.model,name:event.model_event_confirm
msgid "Event Confirmation"
msgstr ""
msgstr "Потврдување на настан"
#. module: event
#: view:report.event.registration:0
@ -1191,4 +1199,4 @@ msgstr "Година"
#. module: event
#: field:event.event,speaker_confirmed:0
msgid "Speaker Confirmed"
msgstr ""
msgstr "Гласноговорникот е потврден"

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-08 14:45+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 12:08+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-09 05:38+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: event_moodle
#: view:event.moodle.config.wiz:0
@ -33,6 +33,8 @@ msgid ""
"URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
"'http://localhost'"
msgstr ""
"URl адресата на вашиот moodle сервер. На пример, 'http://127.0.0.1' или "
"'http://localhost'"
#. module: event_moodle
#: field:event.registration,moodle_user_password:0
@ -62,6 +64,9 @@ msgid ""
"'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
"application."
msgstr ""
"Најлесен начин да се поврзете на OpenERP со moodle сервер е да креирате "
"токен во moodle. Тој ќе се користи за автентикација на OpenERP како "
"поверлива апликација."
#. module: event_moodle
#: field:event.moodle.config.wiz,url:0
@ -71,7 +76,7 @@ msgstr "URL на Moodle Сервер"
#. module: event_moodle
#: help:event.moodle.config.wiz,url:0
msgid "The url that will be used for the connection with moodle in xml-rpc"
msgstr ""
msgstr "URL адресата што ќе се користи за врската со moodle во xml-rpc"
#. module: event_moodle
#: model:ir.model,name:event_moodle.model_event_registration
@ -84,11 +89,13 @@ msgid ""
"Another approach is to create a user for OpenERP in Moodle. If you do so, "
"make sure that this user has appropriate access rights."
msgstr ""
"Другиот начин е да се креира корисник за OpenERP во Moodle. Доколку го "
"направите тоа, погрижете се овој корисник да ги има сите права за пристап."
#. module: event_moodle
#: field:event.registration,moodle_uid:0
msgid "Moodle User ID"
msgstr ""
msgstr "Moodle корисничко ID"
#. module: event_moodle
#: field:event.moodle.config.wiz,server_moodle:0
@ -117,7 +124,7 @@ msgstr "Грешка!"
#: code:addons/event_moodle/event_moodle.py:105
#, python-format
msgid "You must configure your moodle connection."
msgstr ""
msgstr "Мора да ја конфигурирате вашата moodle врска."
#. module: event_moodle
#: field:event.moodle.config.wiz,moodle_username:0
@ -153,7 +160,7 @@ msgstr "Идентификувач на овој настан во Moodle"
#. module: event_moodle
#: help:event.moodle.config.wiz,moodle_token:0
msgid "Put your token that you created in your moodle server"
msgstr ""
msgstr "Токенот што го креиравте, вметнете го во вашиот moodle сервер"
#. module: event_moodle
#: model:ir.ui.menu,name:event_moodle.wizard_moodle
@ -169,7 +176,7 @@ msgstr "или"
#: code:addons/event_moodle/event_moodle.py:57
#, python-format
msgid "First configure your moodle connection."
msgstr ""
msgstr "Најпрво конфигурирајте ја вашата moodle врска"
#. module: event_moodle
#: view:event.moodle.config.wiz:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-11 12:49+0000\n"
"PO-Revision-Date: 2013-03-13 11:48+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-12 05:18+0000\n"
"X-Generator: Launchpad (build 16524)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: event_sale
#: model:ir.model,name:event_sale.model_product_product
@ -39,7 +39,7 @@ msgstr ""
#. module: event_sale
#: model:event.event,name:event_sale.event_technical_training
msgid "Technical training in Grand-Rosiere"
msgstr ""
msgstr "Техничка обука во Grand-Rosiere"
#. module: event_sale
#: help:product.product,event_type_id:0

View File

@ -9,15 +9,15 @@ msgstr ""
"Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
"macedonian@lists.launchpad.net >\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-02-28 20:33+0000\n"
"Last-Translator: Софче Димитријева <Unknown>\n"
"PO-Revision-Date: 2013-03-13 12:01+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: OpenERP Macedonia <openerp-i18n-"
"macedonian@lists.launchpad.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-03-08 05:42+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: fetchmail
@ -48,6 +48,8 @@ msgid ""
"Connections are encrypted with SSL/TLS through a dedicated port (default: "
"IMAPS=993, POP3S=995)"
msgstr ""
"Врската е енкриптирана со SSL/TLS преку зададен порт (стандардно: IMAPS=993, "
"POP3S=995)"
#. module: fetchmail
#: field:fetchmail.server,attach:0
@ -78,7 +80,7 @@ msgstr "Конфигурирање на портал за влезна е-пош
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Fetch Now"
msgstr ""
msgstr "Земи сега"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@ -124,12 +126,12 @@ msgstr "SSL"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_fetchmail_config_settings
msgid "fetchmail.config.settings"
msgstr ""
msgstr "fetchmail.config.settings"
#. module: fetchmail
#: field:fetchmail.server,date:0
msgid "Last Fetch Date"
msgstr ""
msgstr "ПОследен датум за земање"
#. module: fetchmail
#: help:fetchmail.server,action_id:0
@ -162,7 +164,7 @@ msgstr "Конфигурација"
#. module: fetchmail
#: field:fetchmail.server,script:0
msgid "Script"
msgstr ""
msgstr "Скрипта"
#. module: fetchmail
#: view:fetchmail.server:0
@ -183,7 +185,7 @@ msgstr "Корисничко име"
#. module: fetchmail
#: help:fetchmail.server,server:0
msgid "Hostname or IP of the mail server"
msgstr ""
msgstr "Име на хостот или IP-адреса на меил серверот"
#. module: fetchmail
#: field:fetchmail.server,name:0
@ -248,7 +250,7 @@ msgstr "Излезни мејлови"
#. module: fetchmail
#: field:fetchmail.server,priority:0
msgid "Server Priority"
msgstr ""
msgstr "Приоритет на серверот"
#. module: fetchmail
#: selection:fetchmail.server,type:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:39+0000\n"
"PO-Revision-Date: 2013-03-04 13:27+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 09:07+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 05:42+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: fleet
#: selection:fleet.vehicle,fuel_type:0
@ -147,7 +147,7 @@ msgstr "Литр"
#. module: fleet
#: model:ir.actions.client,name:fleet.action_fleet_menu
msgid "Open Fleet Menu"
msgstr "Авто Цэс Нээх"
msgstr "Авто-парк Цэс Нээх"
#. module: fleet
#: view:board.board:0
@ -328,7 +328,7 @@ msgstr "Агаар Шүүгч Солилт"
#. module: fleet
#: model:ir.model,name:fleet.model_fleet_vehicle_tag
msgid "fleet.vehicle.tag"
msgstr "fleet.vehicle.tag"
msgstr "авто-парк.авто-хэрэгсэл.тойг"
#. module: fleet
#: view:fleet.vehicle:0
@ -1100,7 +1100,7 @@ msgstr ""
#. module: fleet
#: view:board.board:0
msgid "Fleet Dashboard"
msgstr ""
msgstr "Авто-паркийн дэйшбоард"
#. module: fleet
#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
@ -1324,7 +1324,7 @@ msgstr ""
#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
#: model:ir.ui.menu,name:fleet.menu_root
msgid "Fleet"
msgstr "Авто бааз /// Флот /// Авто зогсоол гэх үү ????"
msgstr "Авто-парк"
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_14
@ -1634,7 +1634,7 @@ msgstr ""
#: code:addons/fleet/fleet.py:397
#, python-format
msgid "Vehicle %s has been added to the fleet!"
msgstr ""
msgstr "Авто-хэрэгсэл %s нь авто-паркад бүртгэгдлээ"
#. module: fleet
#: view:fleet.vehicle.log.contract:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-02 22:59+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 08:00+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-08 05:42+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: google_base_account
#: field:res.users,gmail_user:0
@ -78,7 +78,7 @@ msgstr "Неуспешна најава. Проверете го корисни
#. module: google_base_account
#: view:google.login:0
msgid "e.g. user@gmail.com"
msgstr ""
msgstr "на пр. user@gmail.com"
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:29

View File

@ -9,15 +9,15 @@ msgstr ""
"Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
"macedonian@lists.launchpad.net >\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-11 22:47+0000\n"
"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
"PO-Revision-Date: 2013-03-13 08:23+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: OpenERP Macedonia <openerp-i18n-"
"macedonian@lists.launchpad.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-03-12 05:18+0000\n"
"X-Generator: Launchpad (build 16524)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"Language: mk\n"
#. module: hr
@ -152,7 +152,7 @@ msgstr "Очекува при вработувањето"
#. module: hr
#: view:hr.employee:0
msgid "Other Information ..."
msgstr ""
msgstr "Други информации..."
#. module: hr
#: constraint:hr.employee.category:0
@ -208,7 +208,7 @@ msgstr "Пораки"
#. module: hr
#: view:hr.config.settings:0
msgid "Talent Management"
msgstr ""
msgstr "Управување со таленти"
#. module: hr
#: help:hr.config.settings,module_hr_timesheet_sheet:0
@ -334,6 +334,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
"Прикажува резиме на конверзација (број на пораки, ...). Ова резиме е "
"директно во html формат со цел да биде вметнато во kanban преглед."
#. module: hr
#: help:hr.config.settings,module_account_analytic_analysis:0
@ -411,7 +413,7 @@ msgstr "Контакт на вработен"
#. module: hr
#: view:hr.employee:0
msgid "e.g. Part Time"
msgstr ""
msgstr "на пр. Дел од времето"
#. module: hr
#: model:ir.actions.act_window,help:hr.action_hr_job
@ -933,7 +935,7 @@ msgstr "Конфигурирај човечки ресурси"
#. module: hr
#: selection:hr.job,state:0
msgid "No Recruitment"
msgstr ""
msgstr "Нема вработување"
#. module: hr
#: help:hr.employee,ssnid:0

View File

@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
'depends': ['hr', 'account_voucher'],
'depends': ['hr', 'account_voucher', 'account_accountant'],
'data': [
'security/ir.model.access.csv',
'hr_expense_data.xml',

View File

@ -145,93 +145,234 @@ class hr_expense_expense(osv.osv):
def expense_canceled(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
def action_receipt_create(self, cr, uid, ids, context=None):
property_obj = self.pool.get('ir.property')
sequence_obj = self.pool.get('ir.sequence')
analytic_journal_obj = self.pool.get('account.analytic.journal')
account_journal = self.pool.get('account.journal')
voucher_obj = self.pool.get('account.voucher')
currency_obj = self.pool.get('res.currency')
wkf_service = netsvc.LocalService("workflow")
def account_move_get(self, cr, uid, expense_id, context=None):
'''
This method prepare the creation of the account move related to the given expense.
:param expense_id: Id of voucher for which we are creating account_move.
:return: mapping between fieldname and value of account move to create
:rtype: dict
'''
journal_obj = self.pool.get('account.journal')
expense = self.browse(cr, uid, expense_id, context=context)
company_id = expense.company_id.id
date = expense.date_confirm
ref = expense.name
journal_id = False
if expense.journal_id:
journal_id = expense.journal_id.id
else:
journal_id = journal_obj.search(cr, uid, [('type', '=', 'purchase'), ('company_id', '=', company_id)])
if not journal_id:
raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
journal_id = journal_id[0]
return self.pool.get('account.move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context)
def line_get_convert(self, cr, uid, x, part, date, context=None):
partner_id = self.pool.get('res.partner')._find_accounting_partner(part).id
return {
'date_maturity': x.get('date_maturity', False),
'partner_id': partner_id,
'name': x['name'][:64],
'date': date,
'debit': x['price']>0 and x['price'],
'credit': x['price']<0 and -x['price'],
'account_id': x['account_id'],
'analytic_lines': x.get('analytic_lines', False),
'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
'currency_id': x.get('currency_id', False),
'tax_code_id': x.get('tax_code_id', False),
'tax_amount': x.get('tax_amount', False),
'ref': x.get('ref', False),
'quantity': x.get('quantity',1.00),
'product_id': x.get('product_id', False),
'product_uom_id': x.get('uos_id', False),
'analytic_account_id': x.get('account_analytic_id', False),
}
def compute_expense_totals(self, cr, uid, exp, company_currency, ref, account_move_lines, context=None):
'''
internal method used for computation of total amount of an expense in the company currency and
in the expense currency, given the account_move_lines that will be created. It also do some small
transformations at these account_move_lines (for multi-currency purposes)
:param account_move_lines: list of dict
:rtype: tuple of 3 elements (a, b ,c)
a: total in company currency
b: total in hr.expense currency
c: account_move_lines potentially modified
'''
cur_obj = self.pool.get('res.currency')
if context is None:
context = {}
for exp in self.browse(cr, uid, ids, context=context):
company_id = exp.company_id.id
lines = []
total = 0.0
ctx = context.copy()
ctx.update({'date': exp.date})
journal = False
if exp.journal_id:
journal = exp.journal_id
context={}
context.update({'date': exp.date_confirm or time.strftime('%Y-%m-%d')})
total = 0.0
total_currency = 0.0
for i in account_move_lines:
if exp.currency_id.id != company_currency:
i['currency_id'] = exp.currency_id.id
i['amount_currency'] = i['price']
i['price'] = cur_obj.compute(cr, uid, exp.currency_id.id,
company_currency, i['price'],
context=context)
else:
journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
if journal_id:
journal = account_journal.browse(cr, uid, journal_id, context=context)
if not journal:
raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
for line in exp.line_ids:
if line.product_id:
acc = line.product_id.property_account_expense
if not acc:
acc = line.product_id.categ_id.property_account_expense_categ
else:
acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
if not acc:
raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
total_amount = line.total_amount
if journal.currency:
if exp.currency_id != journal.currency:
total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
elif exp.currency_id != exp.company_id.currency_id:
total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
lines.append((0, False, {
'name': line.name,
'account_id': acc.id,
'account_analytic_id': line.analytic_account.id,
'amount': total_amount,
'type': 'dr'
}))
total += total_amount
i['amount_currency'] = False
i['currency_id'] = False
total -= i['price']
total_currency -= i['amount_currency'] or i['price']
return total, total_currency, account_move_lines
def action_receipt_create(self, cr, uid, ids, context=None):
'''
main function that is called when trying to create the accounting entries related to an expense
'''
move_obj = self.pool.get('account.move')
for exp in self.browse(cr, uid, ids, context=context):
if not exp.employee_id.address_home_id:
raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
company_currency = exp.company_id.currency_id.id
diff_currency_p = exp.currency_id.id <> company_currency
#create the move that will contain the accounting entries
move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, context=context), context=context)
#one account.move.line per expense line (+taxes..)
eml = self.move_line_get(cr, uid, exp.id, context=context)
#create one more move line, a counterline for the total on payable account
total, total_currency, eml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, eml, context=context)
acc = exp.employee_id.address_home_id.property_account_payable.id
voucher = {
'name': exp.name or '/',
'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
'account_id': acc,
'type': 'purchase',
'partner_id': exp.employee_id.address_home_id.id,
'company_id': company_id,
'line_ids': lines,
'amount': total,
'journal_id': journal.id,
}
if journal and not journal.analytic_journal_id:
analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
if analytic_journal_ids:
account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'done'}, context=context)
eml.append({
'type': 'dest',
'name': '/',
'price': total,
'account_id': acc,
'date_maturity': exp.date_confirm,
'amount_currency': diff_currency_p and total_currency or False,
'currency_id': diff_currency_p and exp.currency_id.id or False,
'ref': exp.name
})
#convert eml into an osv-valid format
lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.employee_id.address_home_id, exp.date_confirm, context=context)), eml)
move_obj.write(cr, uid, [move_id], {'line_id': lines}, context=context)
self.write(cr, uid, ids, {'account_move_id': move_id, 'state': 'done'}, context=context)
return True
def move_line_get(self, cr, uid, expense_id, context=None):
res = []
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
if context is None:
context = {}
exp = self.browse(cr, uid, expense_id, context=context)
company_currency = exp.company_id.currency_id.id
for line in exp.line_ids:
mres = self.move_line_get_item(cr, uid, line, context)
if not mres:
continue
res.append(mres)
tax_code_found= False
#Calculate tax according to default tax on product
taxes = []
#Taken from product_id_onchange in account.invoice
if line.product_id:
fposition_id = False
fpos_obj = self.pool.get('account.fiscal.position')
fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
product = line.product_id
taxes = product.supplier_taxes_id
#If taxes are not related to the product, maybe they are in the account
if not taxes:
a = product.property_account_expense.id #Why is not there a check here?
if not a:
a = product.categ_id.property_account_expense_categ.id
a = fpos_obj.map_account(cr, uid, fpos, a)
taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
if not taxes:
continue
#Calculating tax on the line and creating move?
for tax in tax_obj.compute_all(cr, uid, taxes,
line.unit_amount ,
line.unit_quantity, line.product_id,
exp.user_id.partner_id)['taxes']:
tax_code_id = tax['base_code_id']
tax_amount = line.total_amount * tax['base_sign']
if tax_code_found:
if not tax_code_id:
continue
res.append(self.move_line_get_item(cr, uid, line, context))
res[-1]['price'] = 0.0
res[-1]['account_analytic_id'] = False
elif not tax_code_id:
continue
tax_code_found = True
res[-1]['tax_code_id'] = tax_code_id
res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm})
#Will create the tax here as we don't have the access
assoc_tax = {
'type':'tax',
'name':tax['name'],
'price_unit': tax['price_unit'],
'quantity': 1,
'price': tax['amount'] * tax['base_sign'] or 0.0,
'account_id': tax['account_collected_id'],
'tax_code_id': tax['tax_code_id'],
'tax_amount': tax['amount'] * tax['base_sign'],
}
res.append(assoc_tax)
return res
def move_line_get_item(self, cr, uid, line, context=None):
company = line.expense_id.company_id
property_obj = self.pool.get('ir.property')
if line.product_id:
acc = line.product_id.property_account_expense
if not acc:
acc = line.product_id.categ_id.property_account_expense_categ
else:
acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company.id})
if not acc:
raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
return {
'type':'src',
'name': line.name.split('\n')[0][:64],
'price_unit':line.unit_amount,
'quantity':line.unit_quantity,
'price':line.total_amount,
'account_id':acc.id,
'product_id':line.product_id.id,
'uos_id':line.uom_id.id,
'account_analytic_id':line.analytic_account.id,
}
def action_view_receipt(self, cr, uid, ids, context=None):
'''
This function returns an action that display existing receipt of given expense ids.
This function returns an action that display existing account.move of given expense ids.
'''
assert len(ids) == 1, 'This option should only be used for a single id at a time'
voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
expense = self.browse(cr, uid, ids[0], context=context)
assert expense.account_move_id
try:
dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'view_move_form')
except ValueError, e:
view_id = False
result = {
'name': _('Expense Receipt'),
'name': _('Expense Account Move'),
'view_type': 'form',
'view_mode': 'form',
'view_id': res and res[1] or False,
'res_model': 'account.voucher',
'view_id': view_id,
'res_model': 'account.move',
'type': 'ir.actions.act_window',
'nodestroy': True,
'target': 'current',
'res_id': voucher_id,
'res_id': expense.account_move_id.id,
}
return result

View File

@ -67,7 +67,7 @@
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
<button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
<button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
<button name="action_view_receipt" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header>
<sheet>
@ -133,7 +133,8 @@
<group>
<group string="Accounting Data">
<field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
<field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
<field name="account_move_id"/>
<field name="voucher_id" invisible="1" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
</group>
</group>
</page>

View File

@ -26,11 +26,6 @@
!python {model: hr.expense.expense}: |
sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
assert sep_expenses.state == 'done', "Expense should be in 'Done' state."
assert sep_expenses.voucher_id, "Expense should have link of Purchase Receipt."
assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."
-
I duplicate the expenses and cancel duplicated.
-

906
addons/lunch/i18n/mk.po Normal file
View File

@ -0,0 +1,906 @@
# Macedonian translation for openobject-addons
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-03-13 07:53+0000\n"
"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
"Language-Team: Macedonian <mk@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: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: lunch
#: field:lunch.product,category_id:0
#: field:lunch.product.category,name:0
msgid "Category"
msgstr "Категорија"
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_order_by_supplier_form
msgid "Today's Orders by Supplier"
msgstr ""
#. module: lunch
#: view:lunch.order:0
msgid "My Orders"
msgstr ""
#. module: lunch
#: selection:lunch.order,state:0
msgid "Partially Confirmed"
msgstr ""
#. module: lunch
#: view:lunch.cashmove:0
#: view:lunch.order.line:0
msgid "Group By..."
msgstr "Групирај По..."
#. module: lunch
#: field:lunch.alert,sunday:0
msgid "Sunday"
msgstr "Недела"
#. module: lunch
#: field:lunch.order.line,supplier:0
#: field:lunch.product,supplier:0
msgid "Supplier"
msgstr "Добавувач"
#. module: lunch
#: view:lunch.order.line:0
msgid "Today"
msgstr "Денес"
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "March"
msgstr "Март"
#. module: lunch
#: view:lunch.cashmove:0
msgid "By Employee"
msgstr "По Вработен"
#. module: lunch
#: field:lunch.alert,friday:0
msgid "Friday"
msgstr "Петок"
#. module: lunch
#: view:lunch.validation:0
msgid "validate order lines"
msgstr ""
#. module: lunch
#: view:lunch.order.line:0
msgid "Order lines Tree"
msgstr ""
#. module: lunch
#: field:lunch.alert,specific_day:0
#: field:report.lunch.order.line,day:0
msgid "Day"
msgstr "Ден"
#. module: lunch
#: view:lunch.order.line:0
#: selection:lunch.order.line,state:0
msgid "Received"
msgstr "Примено"
#. module: lunch
#: view:lunch.order.line:0
msgid "By Supplier"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_order_tree
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a lunch order. \n"
" </p>\n"
" <p>\n"
" A lunch order is defined by its user, date and order lines.\n"
" Each order line corresponds to a product, an additional note "
"and a price.\n"
" Before selecting your order lines, don't forget to read the "
"warnings displayed in the reddish area.\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: view:lunch.order.line:0
msgid "Not Received"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_order_by_supplier_form
#: model:ir.ui.menu,name:lunch.menu_lunch_control_suppliers
msgid "Orders by Supplier"
msgstr ""
#. module: lunch
#: view:lunch.validation:0
msgid "Receive Meals"
msgstr ""
#. module: lunch
#: view:lunch.cashmove:0
msgid "cashmove form"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove_form
msgid ""
"<p>\n"
" Here you can see your cash moves.<br/>A cash moves can be "
"either an expense or a payment.\n"
" An expense is automatically created when an order is "
"received while a payment is a reimbursement to the company encoded by the "
"manager.\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: field:lunch.cashmove,amount:0
msgid "Amount"
msgstr "Износ"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_products
#: model:ir.ui.menu,name:lunch.menu_lunch_products
#: field:lunch.order,order_line_ids:0
msgid "Products"
msgstr "Производи"
#. module: lunch
#: view:lunch.order.line:0
msgid "By Date"
msgstr "По датум"
#. module: lunch
#: selection:lunch.order,state:0
#: view:lunch.order.line:0
#: selection:lunch.order.line,state:0
msgid "Cancelled"
msgstr "Откажано"
#. module: lunch
#: view:lunch.cashmove:0
msgid "lunch employee payment"
msgstr ""
#. module: lunch
#: view:lunch.alert:0
msgid "alert tree"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_report_lunch_order_line
msgid "Lunch Orders Statistics"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_alert
msgid "Lunch Alert"
msgstr ""
#. module: lunch
#: code:addons/lunch/lunch.py:183
#, python-format
msgid "Select a product and put your order comments on the note."
msgstr ""
#. module: lunch
#: selection:lunch.alert,alter_type:0
msgid "Every Week"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
msgid "Register Cash Moves"
msgstr ""
#. module: lunch
#: selection:lunch.order,state:0
msgid "Confirmed"
msgstr "Потврдено"
#. module: lunch
#: view:lunch.order:0
msgid "lunch orders"
msgstr ""
#. module: lunch
#: view:lunch.order.line:0
msgid "Confirm"
msgstr "Потврди"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
msgid "Your Account"
msgstr ""
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
msgid "Your Lunch Account"
msgstr ""
#. module: lunch
#: field:lunch.alert,active_from:0
msgid "Between"
msgstr "Помеѓу"
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_order_order
msgid "Wizard to order a meal"
msgstr ""
#. module: lunch
#: selection:lunch.order,state:0
#: selection:lunch.order.line,state:0
msgid "New"
msgstr "Ново"
#. module: lunch
#: code:addons/lunch/lunch.py:180
#, python-format
msgid "This is the first time you order a meal"
msgstr ""
#. module: lunch
#: field:report.lunch.order.line,price_total:0
msgid "Total Price"
msgstr "Вкупна цена"
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_validation
msgid "lunch validation for order"
msgstr ""
#. module: lunch
#: report:lunch.order.line:0
msgid "Name/Date"
msgstr ""
#. module: lunch
#: report:lunch.order.line:0
msgid "Total :"
msgstr "Вкупно :"
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "July"
msgstr "Јули"
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_config
msgid "Configuration"
msgstr "Конфигурација"
#. module: lunch
#: field:lunch.order,state:0
#: field:lunch.order.line,state:0
msgid "Status"
msgstr "Статус"
#. module: lunch
#: view:lunch.order.order:0
msgid ""
"Order a meal doesn't mean that we have to pay it.\n"
" A meal should be paid when it is received."
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
#: model:ir.ui.menu,name:lunch.menu_lunch_control_accounts
msgid "Control Accounts"
msgstr ""
#. module: lunch
#: selection:lunch.alert,alter_type:0
msgid "Every Day"
msgstr ""
#. module: lunch
#: field:lunch.order.line,cashmove:0
msgid "Cash Move"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.order_order_lines
msgid "Order meals"
msgstr ""
#. module: lunch
#: view:lunch.alert:0
msgid "Schedule Hour"
msgstr ""
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "September"
msgstr "Септември"
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_control_suppliers
msgid ""
"<p>\n"
" Here you can see every orders grouped by suppliers and by "
"date.\n"
" </p>\n"
" <p>\n"
" - Click on the <img "
"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
"that the order is ordered <br/>\n"
" - Click on the <img "
"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
"the order is received <br/>\n"
" - Click on the <img "
"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> red X to announce "
"that the order isn't available\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: field:lunch.alert,tuesday:0
msgid "Tuesday"
msgstr "Вторник"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
msgid "Your Orders"
msgstr ""
#. module: lunch
#: field:report.lunch.order.line,month:0
msgid "Month"
msgstr "Месец"
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_products
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a product for lunch. \n"
" </p>\n"
" <p>\n"
" A product is defined by its name, category, price and "
"supplier.\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: view:lunch.alert:0
#: field:lunch.alert,message:0
msgid "Message"
msgstr "Порака"
#. module: lunch
#: view:lunch.order.order:0
msgid "Order Meals"
msgstr ""
#. module: lunch
#: view:lunch.cancel:0
#: view:lunch.order.order:0
#: view:lunch.validation:0
msgid "or"
msgstr "или"
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a lunch category. \n"
" </p>\n"
" <p>\n"
" Here you can find every lunch categories for products.\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: view:lunch.order.order:0
msgid "Order meal"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
#: model:ir.ui.menu,name:lunch.menu_lunch_product_categories
msgid "Product Categories"
msgstr "Категории на производ"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_control_suppliers
msgid "Control Suppliers"
msgstr ""
#. module: lunch
#: view:lunch.alert:0
msgid "Schedule Date"
msgstr "Планиран датум"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_alert
#: model:ir.ui.menu,name:lunch.menu_lunch_alert
#: field:lunch.order,alerts:0
msgid "Alerts"
msgstr "Известувања"
#. module: lunch
#: field:lunch.order.line,note:0
#: field:report.lunch.order.line,note:0
msgid "Note"
msgstr "Белешка"
#. module: lunch
#: code:addons/lunch/lunch.py:250
#, python-format
msgid "Add"
msgstr "Додади"
#. module: lunch
#: view:lunch.product:0
#: view:lunch.product.category:0
msgid "Products Form"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.cancel_order_lines
msgid "Cancel meals"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_cashmove
#: view:lunch.cashmove:0
msgid "lunch cashmove"
msgstr ""
#. module: lunch
#: view:lunch.cancel:0
msgid "Are you sure you want to cancel these meals?"
msgstr ""
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "August"
msgstr "Август"
#. module: lunch
#: field:lunch.alert,monday:0
msgid "Monday"
msgstr "Понеделник"
#. module: lunch
#: field:lunch.order.line,name:0
msgid "unknown"
msgstr "непознато"
#. module: lunch
#: model:ir.actions.act_window,name:lunch.validate_order_lines
msgid "Receive meals"
msgstr ""
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "June"
msgstr "Јуни"
#. module: lunch
#: field:lunch.cashmove,user_id:0
#: field:lunch.order,user_id:0
#: field:report.lunch.order.line,user_id:0
msgid "User Name"
msgstr "Корисничко име"
#. module: lunch
#: model:ir.module.category,name:lunch.module_lunch_category
#: model:ir.ui.menu,name:lunch.menu_lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_title
msgid "Lunch"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_order_line
msgid "lunch order line"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_product
msgid "lunch product"
msgstr ""
#. module: lunch
#: field:lunch.order.line,user_id:0
#: model:res.groups,name:lunch.group_lunch_user
msgid "User"
msgstr "Корисник"
#. module: lunch
#: field:lunch.cashmove,date:0
#: field:lunch.order,date:0
#: field:lunch.order.line,date:0
msgid "Date"
msgstr "Датум"
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "November"
msgstr "Ноември"
#. module: lunch
#: view:lunch.order:0
msgid "Orders Tree"
msgstr ""
#. module: lunch
#: view:lunch.order:0
msgid "Orders Form"
msgstr ""
#. module: lunch
#: view:lunch.alert:0
#: view:lunch.order.line:0
msgid "Search"
msgstr "Пребарувај"
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "October"
msgstr "Октомври"
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_order_by_supplier_form
msgid ""
"<p>\n"
" Here you can see today's orders grouped by suppliers.\n"
" </p>\n"
" <p>\n"
" - Click on the <img "
"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
"that the order is ordered <br/>\n"
" - Click on the <img "
"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
"the order is received <br/>\n"
" - Click on the <img "
"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> to announce that "
"the order isn't available\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "January"
msgstr "Јануари"
#. module: lunch
#: selection:lunch.alert,alter_type:0
msgid "Specific Day"
msgstr ""
#. module: lunch
#: field:lunch.alert,wednesday:0
msgid "Wednesday"
msgstr "Среда"
#. module: lunch
#: view:lunch.product.category:0
msgid "Product Category: "
msgstr ""
#. module: lunch
#: field:lunch.alert,active_to:0
msgid "And"
msgstr "И"
#. module: lunch
#: view:lunch.alert:0
msgid "Write the message you want to display during the defined period..."
msgstr ""
#. module: lunch
#: selection:lunch.order.line,state:0
msgid "Ordered"
msgstr ""
#. module: lunch
#: field:report.lunch.order.line,date:0
msgid "Date Order"
msgstr "Датум на налогот"
#. module: lunch
#: view:lunch.cancel:0
msgid "Cancel Orders"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_alert
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a lunch alert. \n"
" </p>\n"
" <p>\n"
" Alerts are used to warn employee from possible issues "
"concerning the lunch orders.\n"
" To create a lunch alert you have to define its recurrency, "
"the time interval during which the alert should be executed and the message "
"to display.\n"
" </p>\n"
" <p>\n"
" Example: <br/>\n"
" - Recurency: Everyday<br/>\n"
" - Time interval: from 00h00 am to 11h59 pm<br/>\n"
" - Message: \"You must order before 10h30 am\"\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: view:lunch.cancel:0
msgid "A cancelled meal should not be paid by employees."
msgstr ""
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_cash
msgid "Administrate Cash Moves"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_cancel
msgid "cancel lunch order"
msgstr ""
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "December"
msgstr "Декември"
#. module: lunch
#: view:lunch.cancel:0
#: view:lunch.order.line:0
#: view:lunch.order.order:0
#: view:lunch.validation:0
msgid "Cancel"
msgstr "Откажи"
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a payment. \n"
" </p>\n"
" <p>\n"
" Here you can see the employees' payment. A payment is a cash "
"move from the employee to the company.\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: code:addons/lunch/lunch.py:186
#, python-format
msgid "Your favorite meals will be created based on your last orders."
msgstr ""
#. module: lunch
#: model:ir.module.category,description:lunch.module_lunch_category
msgid ""
"Helps you handle your lunch needs, if you are a manager you will be able to "
"create new products, cashmoves and to confirm or cancel orders."
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a new payment. \n"
" </p>\n"
" <p>\n"
" A cashmove can either be an expense or a payment.<br/>\n"
" An expense is automatically created at the order "
"receipt.<br/>\n"
" A payment represents the employee reimbursement to the "
"company.\n"
" </p>\n"
" "
msgstr ""
#. module: lunch
#: field:lunch.alert,alter_type:0
msgid "Recurrency"
msgstr "Повторливост"
#. module: lunch
#: code:addons/lunch/lunch.py:189
#, python-format
msgid "Don't forget the alerts displayed in the reddish area"
msgstr ""
#. module: lunch
#: field:lunch.alert,thursday:0
msgid "Thursday"
msgstr "Четврток"
#. module: lunch
#: report:lunch.order.line:0
msgid "Unit Price"
msgstr "Единечна цена"
#. module: lunch
#: view:lunch.cashmove:0
msgid "By User"
msgstr ""
#. module: lunch
#: field:lunch.order.line,product_id:0
#: field:lunch.product,name:0
msgid "Product"
msgstr "Производ"
#. module: lunch
#: field:lunch.cashmove,description:0
#: report:lunch.order.line:0
#: field:lunch.product,description:0
msgid "Description"
msgstr "Опис"
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "May"
msgstr "Мај"
#. module: lunch
#: field:lunch.order.line,price:0
#: field:lunch.product,price:0
msgid "Price"
msgstr "Цена"
#. module: lunch
#: field:lunch.cashmove,state:0
msgid "Is an order or a Payment"
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
msgid "New Order"
msgstr ""
#. module: lunch
#: view:lunch.cashmove:0
msgid "cashmove tree"
msgstr ""
#. module: lunch
#: view:lunch.cancel:0
msgid "Cancel a meal means that we didn't receive it from the supplier."
msgstr ""
#. module: lunch
#: view:lunch.cashmove:0
msgid "My Account grouped"
msgstr ""
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
msgid "Employee Payments"
msgstr ""
#. module: lunch
#: view:lunch.cashmove:0
#: selection:lunch.cashmove,state:0
msgid "Payment"
msgstr "Плаќање"
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "February"
msgstr "Февруари"
#. module: lunch
#: field:report.lunch.order.line,year:0
msgid "Year"
msgstr "Година"
#. module: lunch
#: view:lunch.order:0
msgid "List"
msgstr "Листа"
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_admin
msgid "Administrate Orders"
msgstr ""
#. module: lunch
#: selection:report.lunch.order.line,month:0
msgid "April"
msgstr "Април"
#. module: lunch
#: view:lunch.order:0
msgid "Select your order"
msgstr ""
#. module: lunch
#: field:lunch.cashmove,order_id:0
#: selection:lunch.cashmove,state:0
#: report:lunch.order.line:0
#: view:lunch.order.line:0
#: field:lunch.order.line,order_id:0
msgid "Order"
msgstr "Нарачка"
#. module: lunch
#: model:ir.actions.report.xml,name:lunch.report_lunch_order
#: model:ir.model,name:lunch.model_lunch_order
#: report:lunch.order.line:0
msgid "Lunch Order"
msgstr ""
#. module: lunch
#: view:lunch.order.order:0
msgid "Are you sure you want to order these meals?"
msgstr ""
#. module: lunch
#: view:lunch.cancel:0
msgid "cancel order lines"
msgstr ""
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_product_category
msgid "lunch product category"
msgstr ""
#. module: lunch
#: field:lunch.alert,saturday:0
msgid "Saturday"
msgstr "Сабота"
#. module: lunch
#: model:res.groups,name:lunch.group_lunch_manager
msgid "Manager"
msgstr "Менаџер"
#. module: lunch
#: view:lunch.validation:0
msgid "Did your received these meals?"
msgstr ""
#. module: lunch
#: view:lunch.validation:0
msgid "Once a meal is received a new cash move is created for the employee."
msgstr ""
#. module: lunch
#: view:lunch.product:0
msgid "Products Tree"
msgstr ""
#. module: lunch
#: view:lunch.cashmove:0
#: view:lunch.order:0
#: field:lunch.order,total:0
#: view:lunch.order.line:0
msgid "Total"
msgstr "Вкупно"
#. module: lunch
#: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
msgid "Previous Orders"
msgstr ""

View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-11 23:55+0000\n"
"PO-Revision-Date: 2013-03-13 19:40+0000\n"
"Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
"Language-Team: Croatian <hr@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: 2013-03-13 04:58+0000\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: point_of_sale
@ -43,6 +43,25 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknite za "
"kreiranje nove kategorije.\n"
" </p><p>\n"
" Kategorije se "
"koriste za pronalaženje proizvoda kroz \n"
" touschcreen "
"sučelje .\n"
" </p><p>\n"
" Ako stavite "
"sliku na kategoriju, prikaz na \n"
" touckscreen "
"sučelju pokazati sliku kategorije. \n"
" Savjetujemo da "
"ne koristite slike kategorija na \n"
" malim "
"(1024x768) ekranima.\n"
" </p>\n"
" "
#. module: point_of_sale
#: view:pos.receipt:0
@ -91,7 +110,7 @@ msgstr "Dnevnik prodaje"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_2l_product_template
msgid "Spa Reine 2L"
msgstr ""
msgstr "Spa Reine 2L"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@ -259,7 +278,7 @@ msgstr "Prosječna cijena"
#. module: point_of_sale
#: view:pos.order:0
msgid "Accounting Information"
msgstr ""
msgstr "Računovodstvo"
#. module: point_of_sale
#. openerp-web
@ -349,6 +368,8 @@ msgid ""
"Check this if this point of sale should open by default in a self checkout "
"mode. If unchecked, OpenERP uses the normal cashier mode by default."
msgstr ""
"Označite ovje ako se ovaj POS treba zadano otvarati u samonaplatnom načinu "
"rada. Ako nije označeno, OpenERP koristi normalni način blagajne."
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@ -488,7 +509,7 @@ msgstr ") je \""
#. module: point_of_sale
#: model:product.template,name:point_of_sale.Onions_product_template
msgid "Onions"
msgstr ""
msgstr "Luk"
#. module: point_of_sale
#: view:pos.session:0
@ -627,6 +648,28 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" "
"Kliknite za otvaranje nove smjene.\n"
" "
"</p><p>\n"
" "
"Smjena je period vremena, obično jedan ili pola dana\n"
" "
"tijekom kojeg se vrši prodaja na POS-u. Korisnik mora \n"
" "
"provjeriti stanje blagajne na početku i na kraju svake \n"
" "
"smjene.\n"
" "
"</p><p>\n"
" "
"Zapamtite da biste trebali koristiti izbornik <i>Vaša smjena </>\n"
" "
"za brzo otvaranje nove smjene.\n"
" "
"</p>\n"
" "
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:867
@ -1947,6 +1990,8 @@ msgid ""
"Check if, this is a product you can use to put cash into a statement for the "
"point of sale backend."
msgstr ""
"Označite , ukoliko je ovo proizvod koji može koristiti za stavljanje novca u "
"nalog kroz backend POS-a"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
@ -2211,7 +2256,7 @@ msgstr "Date Order"
#. module: point_of_sale
#: view:pos.order:0
msgid "Point of Sale Orders"
msgstr ""
msgstr "Nalozi POS-a"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
@ -2243,6 +2288,23 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknite za "
"dodavanje novog proizvoda.\n"
" </p><p>\n"
" Morate "
"definirati proizvod za sve što prodajete kroz\n"
" sučelje "
"POS-a.\n"
" </p><p>\n"
" Ne "
"zaboravite postaviti cijenu i kategoriju POS-a u kojoj\n"
" bi se "
"proizvod trebao pojaviti. Ako proizvod nije pridružen \n"
" nijednoj "
"kategoriji POS-a nije ga moguće prodavati na taj način\n"
" </p>\n"
" "
#. module: point_of_sale
#: view:pos.order:0
@ -2505,7 +2567,7 @@ msgstr "Dnevnik prodaje"
#. module: point_of_sale
#: view:pos.session:0
msgid "Opening Balance"
msgstr ""
msgstr "Početni saldo"
#. module: point_of_sale
#: view:account.bank.statement:0
@ -2562,12 +2624,12 @@ msgstr "Aktivan"
#. module: point_of_sale
#: field:pos.session,name:0
msgid "Session ID"
msgstr ""
msgstr "ID Smjene"
#. module: point_of_sale
#: view:pos.make.payment:0
msgid "Pay Order"
msgstr ""
msgstr "Naplati naručeno"
#. module: point_of_sale
#: view:pos.session:0
@ -3483,7 +3545,7 @@ msgstr "Ispiši račun"
#. module: point_of_sale
#: field:pos.order,pos_reference:0
msgid "Receipt Ref"
msgstr ""
msgstr "Referenca Računa"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_details
@ -3559,6 +3621,18 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknite za "
"kreiranje novog naloga.\n"
" </p><p>\n"
" Koristite "
"ovaj izbornik za pregled vaših računa. Za stvaranje \n"
" novih "
"računa bolje je koristiti touch screen sučelje korz izbornik\n"
" <i>Vaša "
"smjena</i>.\n"
" </p>\n"
" "
#. module: point_of_sale
#. openerp-web
@ -3928,6 +4002,20 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Kliknite "
"za dodavanje načina plaćanja.\n"
" </p><p>\n"
" Načini "
"plaćanja se definiraju označavanjem polja\n"
" <i>POS "
"način plaćanja</i> u računovodstvenim dnevnicima.\n"
" Da bi "
"bio dostupan na POS-u korz touch screen sučelje,\n"
" morate "
"ga postaviti korz konfiguraciju POS-a\n"
" </p>\n"
" "
#. module: point_of_sale
#: view:pos.order:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:38+0000\n"
"PO-Revision-Date: 2013-02-17 13:06+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:37+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 05:55+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: product
#: field:product.packaging,rows:0
@ -50,7 +50,7 @@ msgstr "Барааны нэр"
#. module: product
#: view:product.template:0
msgid "Second Unit of Measure"
msgstr "Хоёр дахь хэмжих нэгж"
msgstr "Хоёрдогч хэмжих нэгж"
#. module: product
#: help:res.partner,property_product_pricelist:0
@ -141,7 +141,7 @@ msgstr "Уг үнийн дүрмийн нэрлэлт, тайлбарлалт."
#. module: product
#: field:product.template,uos_coeff:0
msgid "Unit of Measure -> UOS Coeff"
msgstr "Хэмжих нэгж -> х.н-н коэф"
msgstr "Хэмжих нэгж -> БХН коэф"
#. module: product
#: field:product.price_list,price_list:0
@ -507,7 +507,7 @@ msgstr "Тоо хэмжээ-3"
#. module: product
#: model:res.groups,name:product.group_product_variant
msgid "Product Variant (not supported)"
msgstr ""
msgstr "Барааны Хувилбар"
#. module: product
#: field:product.price_list,qty4:0
@ -634,7 +634,7 @@ msgstr "Савлагааны өргөний хэмжээ"
#: code:addons/product/product.py:361
#, python-format
msgid "Unit of Measure categories Mismatch!"
msgstr "Ангилалын Хэмжих Нэгж таарахгүй байна!"
msgstr "Хэмжих нэгжийн ангилалууд нь таарахгүй байна."
#. module: product
#: model:product.template,name:product.product_product_36_product_template
@ -830,7 +830,7 @@ msgstr "Гадаад хатуу диск"
#. module: product
#: view:product.product:0
msgid "describe the product characteristics..."
msgstr ""
msgstr "барааны шинжүүдийг тайлбарлах..."
#. module: product
#: help:product.template,standard_price:0
@ -1373,6 +1373,7 @@ msgstr "Бараа"
msgid ""
"Hands free headset for laptop PC with in-line microphone and headphone plug."
msgstr ""
"Микрофон болон чихэвчний оролт бүхий зөөврийн компьютерт зориулсан чихэвч"
#. module: product
#: help:product.packaging,rows:0
@ -1387,7 +1388,7 @@ msgstr "Суурь үнээс дээш тохируулах хамгийн ба
#. module: product
#: field:product.product,name_template:0
msgid "Template Name"
msgstr ""
msgstr "Тэмплэйт Нэр"
#. module: product
#: field:product.template,weight_net:0
@ -1419,7 +1420,7 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "This note will be displayed on requests for quotation..."
msgstr ""
msgstr "Энэ тэмдэглэгээ нь үнийн саналын хүсэлт дээр бичигддэг..."
#. module: product
#: view:product.product:0
@ -1445,7 +1446,7 @@ msgstr "Газар дээрх тусламж"
#. module: product
#: model:product.template,name:product.product_product_39_product_template
msgid "Toner Cartridge"
msgstr ""
msgstr "Принтерийн хор"
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_form_action
@ -1472,7 +1473,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_43_product_template
msgid "Zed+ Antivirus"
msgstr ""
msgstr "Zed+ Antivirus"
#. module: product
#: field:product.pricelist.item,price_version_id:0
@ -1509,7 +1510,7 @@ msgstr "Бохир жин кг-аар."
#. module: product
#: model:product.template,name:product.product_product_37_product_template
msgid "Printer, All-in-one"
msgstr ""
msgstr "Олон үйлдэлт принтер"
#. module: product
#: view:product.template:0
@ -1519,7 +1520,7 @@ msgstr "Татан авалт"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
msgid "Processor AMD 8-Core"
msgstr ""
msgstr "AMD 8-Core процессор"
#. module: product
#: view:product.product:0
@ -1570,7 +1571,7 @@ msgstr "Эхлэх огноо"
#. module: product
#: model:product.template,name:product.product_product_38_product_template
msgid "Ink Cartridge"
msgstr ""
msgstr "Принтерийн бэхэн хор"
#. module: product
#: model:product.uom,name:product.product_uom_cm
@ -1661,7 +1662,7 @@ msgstr "Хувилбарын хамгийн сүүлийн зөв огноо"
#. module: product
#: model:product.template,name:product.product_product_19_product_template
msgid "HDD on Demand"
msgstr ""
msgstr "Зөөврийн хард диск"
#. module: product
#: field:product.price.type,active:0
@ -1848,12 +1849,12 @@ msgstr "Бараа, ангиллаар"
#. module: product
#: model:product.template,name:product.product_product_16_product_template
msgid "Computer Case"
msgstr ""
msgstr "Процессорын хайрцаг"
#. module: product
#: model:product.template,name:product.product_product_9_product_template
msgid "USB Keyboard, AZERTY"
msgstr ""
msgstr "USB товчлуур, AZERTY"
#. module: product
#: help:product.supplierinfo,sequence:0
@ -1898,7 +1899,7 @@ msgstr "30x40x60 хайрцаг"
#. module: product
#: model:product.template,name:product.product_product_47_product_template
msgid "Switch, 24 ports"
msgstr ""
msgstr "24 порт бүхий свич"
#. module: product
#: selection:product.uom,uom_type:0
@ -1919,7 +1920,7 @@ msgstr "Дотоод тайлбар"
#. module: product
#: model:product.template,name:product.product_product_48_product_template
msgid "USB Adapter"
msgstr ""
msgstr "USB адаптер"
#. module: product
#: help:product.template,uos_id:0
@ -1960,7 +1961,7 @@ msgstr "Компани"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
msgid "Laptop S3450"
msgstr ""
msgstr "Гар компьютер S3450"
#. module: product
#: view:product.product:0
@ -2022,7 +2023,7 @@ msgstr "Бүрэлдэхүүнүүд"
#. module: product
#: view:product.product:0
msgid "e.g. 5901234123457"
msgstr ""
msgstr "5901234123457 гэх мэт"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_type
@ -2133,7 +2134,7 @@ msgstr "* ( 1 + "
#. module: product
#: model:product.template,name:product.product_product_31_product_template
msgid "Multimedia Speakers"
msgstr ""
msgstr "Мултимедиа өсгөгчүүд"
#. module: product
#: field:product.product,message_follower_ids:0

File diff suppressed because it is too large Load Diff

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-02 07:42+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:32+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 05:59+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@ -1326,7 +1326,7 @@ msgstr "Уншаагүй Зурвасууд"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Ангилалын Хэмжих Нэгж"
msgstr "Хэмжих Нэгжийн Ангилалууд"
#. module: purchase
#: view:purchase.order:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-02-26 09:40+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:20+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 06:01+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
@ -249,7 +249,7 @@ msgstr "Буруу өгөгдөл"
#. module: sale
#: view:sale.order.line:0
msgid "Cancel Line"
msgstr ""
msgstr "Захиалгын Мөрийг Цуцлах"
#. module: sale
#: help:sale.config.settings,group_discount_per_so_line:0
@ -410,7 +410,7 @@ msgstr "Худал"
#. module: sale
#: view:sale.order:0
msgid "Terms and conditions..."
msgstr ""
msgstr "Гэрээний нөхцлүүд..."
#. module: sale
#: help:sale.advance.payment.inv,advance_payment_method:0
@ -1610,7 +1610,7 @@ msgstr "Миний Борлуулалтын Захиалгын Мөрүүд"
#. module: sale
#: view:sale.order:0
msgid "Cancel Quotation"
msgstr ""
msgstr "Үнийн санал Цуцлах"
#. module: sale
#: field:sale.order,message_follower_ids:0
@ -1717,6 +1717,8 @@ msgstr ""
#, python-format
msgid "There is no default shop for the current user's company!"
msgstr ""
"Идэвхтэй байгаа хэрэглэгчийн компанид дэлгүүрийн анхны утга "
"тодорхойлогдоогүй байна."
#. module: sale
#: model:ir.model,name:sale.model_sale_advance_payment_inv

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:39+0000\n"
"PO-Revision-Date: 2013-03-04 12:07+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 09:58+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 06:02+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: sale_stock
#: help:sale.config.settings,group_invoice_deli_orders:0
@ -80,7 +80,7 @@ msgstr "Батлах"
#. module: sale_stock
#: view:sale.order:0
msgid "Cancel Order"
msgstr ""
msgstr "Захиалга Цуцлах"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:207
@ -177,7 +177,7 @@ msgstr "Нөхөн дүүргэлтийн захиалга"
#. module: sale_stock
#: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children
msgid "Contact Details"
msgstr ""
msgstr "Холбоо барих мэдээлэл"
#. module: sale_stock
#: selection:sale.config.settings,default_order_policy:0

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-03-07 08:37+0000\n"
"PO-Revision-Date: 2013-03-02 09:51+0000\n"
"Last-Translator: gobi <Unknown>\n"
"PO-Revision-Date: 2013-03-13 10:30+0000\n"
"Last-Translator: wsubuntu <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2013-03-08 06:03+0000\n"
"X-Generator: Launchpad (build 16523)\n"
"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#. module: stock
#: field:stock.inventory.line.split,line_exist_ids:0
@ -167,7 +167,7 @@ msgstr "Бэлтгэх Жагсаалт"
#. module: stock
#: view:stock.inventory:0
msgid "e.g. Annual inventory"
msgstr ""
msgstr "Жилийн тооллого гэх мэт"
#. module: stock
#: report:lot.stock.overview:0
@ -722,7 +722,7 @@ msgstr "Захиалга(Эх сурвалж)"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr "Ангилалын Хэмжих Нэгж"
msgstr "Хэмжих Нэгжийн Ангилалууд"
#. module: stock
#: report:lot.stock.overview:0
@ -873,7 +873,7 @@ msgstr "Татан авалтын байрлал"
#. module: stock
#: view:stock.picking:0
msgid "e.g. PO0032"
msgstr ""
msgstr "PO0032 гэх мэт"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_location_tree
@ -2914,7 +2914,7 @@ msgstr "Тооллого цуцлах"
#. module: stock
#: view:stock.move:0
msgid "Cancel Move"
msgstr ""
msgstr "Хөдөлгөөнийг Цуцлах"
#. module: stock
#: code:addons/stock/stock.py:2246
@ -2970,7 +2970,7 @@ msgstr "Барааны тайлан серийн дугаараар"
#. module: stock
#: view:stock.picking:0
msgid "Cancel Transfer"
msgstr ""
msgstr "Шилжилтийг Цуцлах"
#. module: stock
#: selection:report.stock.inventory,month:0