diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index f4823e4b626..510dc185fa6 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-06-20 16:18+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-10-30 15:48+0000\n" +"Last-Translator: Frederic Clementi - Camptocamp.com " +"\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-10-31 04:40+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. module: account #: code:addons/account/account_move_line.py:1215 @@ -151,7 +152,7 @@ msgstr "Définition des enfants" #: code:addons/account/account_bank_statement.py:302 #, python-format msgid "Journal item \"%s\" is not valid." -msgstr "Écriture \"%s\" n'est pas équilibrée" +msgstr "" #. module: account #: model:ir.model,name:account.model_report_aged_receivable @@ -1608,10 +1609,9 @@ msgid "" "entry per accounting document: invoice, refund, supplier payment, bank " "statements, etc." msgstr "" -"Une pièce comptable est composée de plusieurs écritures comptables, chacune " -"étant soit un débit soit un crédit. OpenERP crée automatiquement une pièce " -"comptable par document comptable : facture, avoir, paiement de fournisseur, " -"relevés bancaires, etc." +"Un écriture est composée de plusieurs lignes, chacune étant soit un débit " +"soit un crédit. OpenERP crée automatiquement une écriture par document " +"comptable : facture, avoir, paiement de fournisseur, relevés bancaires, etc." #. module: account #: view:account.entries.report:0 @@ -1703,7 +1703,7 @@ msgstr "Recherche d'un relevé bancaire" #. module: account #: view:account.move.line:0 msgid "Unposted Journal Items" -msgstr "Pièces non comptabiliisées" +msgstr "Ecritures brouillon" #. module: account #: view:account.chart.template:0 @@ -2478,8 +2478,6 @@ msgid "" "In order to delete a bank statement, you must first cancel it to delete " "related journal items." msgstr "" -"Pour supprimer un relevé bancaire vous devez préalablement supprimer les " -"lignes rapprochées." #. module: account #: field:account.invoice,payment_term:0 @@ -3629,7 +3627,7 @@ msgstr "État des ventes par type de compte" #. module: account #: view:account.move.line:0 msgid "Unreconciled Journal Items" -msgstr "Ecritures non lettrées" +msgstr "Ecritures non léttrées" #. module: account #: sql_constraint:res.currency:0 @@ -3900,7 +3898,7 @@ msgstr "" #. module: account #: model:ir.actions.report.xml,name:account.account_account_balance_landscape msgid "Account balance" -msgstr "Balance des comptes" +msgstr "Balance générale" #. module: account #: report:account.invoice:0 @@ -3972,7 +3970,7 @@ msgstr "Nom" #. module: account #: model:ir.model,name:account.model_account_aged_trial_balance msgid "Account Aged Trial balance Report" -msgstr "Rapport du solde de la balance agée" +msgstr "Balance agée" #. module: account #: code:addons/account/account_move_line.py:582 @@ -4181,7 +4179,7 @@ msgstr "" #. module: account #: view:account.move.line:0 msgid "Posted Journal Items" -msgstr "Ecritures saisies" +msgstr "Ecritures validées" #. module: account #: view:account.tax.template:0 @@ -4244,7 +4242,7 @@ msgstr "Titulaire du compte bancaire" #: model:ir.actions.report.xml,name:account.account_account_balance #: model:ir.ui.menu,name:account.menu_general_Balance_report msgid "Trial Balance" -msgstr "Balance des comptes" +msgstr "Balance générale" #. module: account #: model:ir.model,name:account.model_account_invoice_cancel @@ -4659,7 +4657,7 @@ msgstr "Sert de compte par défaut pour le crédit" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "Post Journal Entries" -msgstr "Comptabiliser les pièces comptables dans le journal" +msgstr "Valider les écritures" #. module: account #: selection:account.invoice,state:0 @@ -4927,7 +4925,7 @@ msgstr "" #: code:addons/account/account.py:923 #, python-format msgid "Opening Period" -msgstr "Période ouverte" +msgstr "Période d'ouverture" #. module: account #: view:account.move:0 @@ -5611,7 +5609,7 @@ msgstr "Quantité de produits" #: selection:account.move,state:0 #: view:account.move.line:0 msgid "Unposted" -msgstr "Non comptabilisé" +msgstr "Non validée" #. module: account #: view:account.change.currency:0 @@ -5823,7 +5821,7 @@ msgstr "Journal d'écriture" #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close msgid "Generate Opening Entries" -msgstr "Générer les écritures d'ouverture" +msgstr "Générer l'écriture d'ouverture" #. module: account #: code:addons/account/account_move_line.py:775 @@ -7117,7 +7115,7 @@ msgstr "Sélection du journal" #: code:addons/account/account.py:432 #, python-format msgid "Opening Balance" -msgstr "Solde initial" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_move_reconcile @@ -7727,8 +7725,7 @@ msgstr "Signes sur les Rapports" #: code:addons/account/wizard/account_fiscalyear_close.py:88 #, python-format msgid "The periods to generate opening entries were not found" -msgstr "" -"Les périodes pour générer les écritures d'ouverture n'ont pas été trouvées." +msgstr "Aucune période d'ouverture trouvée" #. module: account #: model:account.account.type,name:account.data_account_type_view @@ -7822,7 +7819,7 @@ msgstr "Journal des ventes" #: code:addons/account/wizard/account_move_journal.py:104 #, python-format msgid "Open Journal Items !" -msgstr "Écritures ouvertes !" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_invoice_tax @@ -7859,7 +7856,7 @@ msgstr "" #. module: account #: view:account.move:0 msgid "Unposted Journal Entries" -msgstr "Pièces non comptabilisées" +msgstr "Ecritures non validées" #. module: account #: view:product.product:0 @@ -7976,7 +7973,7 @@ msgstr "Code de la case" #. module: account #: view:validate.account.move:0 msgid "Post Journal Entries of a Journal" -msgstr "Comptabiliser les pièces comptables d'un journal" +msgstr "Valider les écritures" #. module: account #: view:product.product:0 @@ -8161,7 +8158,7 @@ msgstr "Ligne de caisse" #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other #: model:ir.ui.menu,name:account.menu_account_partner_ledger msgid "Partner Ledger" -msgstr "Grand Livre" +msgstr "Livre des tiers" #. module: account #: selection:account.tax.template,type:0 @@ -8359,7 +8356,7 @@ msgstr "" #: help:account.account,reconcile:0 msgid "" "Check this box if this account allows reconciliation of journal items." -msgstr "Cochez si le compte autorise le lettrage des pièces." +msgstr "Cochez si le compte autorise le lettrage des écritures." #. module: account #: help:account.period,state:0 @@ -9220,7 +9217,7 @@ msgstr "inconnu" #: code:addons/account/account.py:3130 #, python-format msgid "Opening Entries Journal" -msgstr "Journal des écritures d'ouverture" +msgstr "Journal d'ouverture" #. module: account #: model:process.transition,note:account.process_transition_customerinvoice0 @@ -10006,7 +10003,7 @@ msgstr "Ce compte de tiers remplacera le compte par défaut." #. module: account #: field:account.period,special:0 msgid "Opening/Closing Period" -msgstr "Ouverture/clôture d'exercice" +msgstr "Période d'ouverture/clôture" #. module: account #: field:account.account,currency_id:0 @@ -10336,7 +10333,7 @@ msgstr "Date de fin" #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear msgid "Cancel Opening Entries" -msgstr "Annuler les écritures d'ouvertures" +msgstr "Annuler l'écriture d'ouverture" #. module: account #: field:account.payment.term.line,days2:0 @@ -10505,7 +10502,7 @@ msgstr "Signer pour le parent" #. module: account #: model:ir.model,name:account.model_account_balance_report msgid "Trial Balance Report" -msgstr "Rapport sur la balance des comptes" +msgstr "Balance générale" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree @@ -10688,7 +10685,7 @@ msgstr "Intervalle" #. module: account #: view:account.analytic.line:0 msgid "Analytic Journal Items related to a purchase journal." -msgstr "Imputations analytiques relatives au journal des achats." +msgstr "Ecritures analytiques relatives au journal des achats." #. module: account #: help:account.account,type:0 @@ -11213,7 +11210,7 @@ msgstr "Future" #. module: account #: view:account.move.line:0 msgid "Search Journal Items" -msgstr "Rechercher des écritures comptables" +msgstr "Recherche par ligne d'écritures" #. module: account #: help:account.tax,base_sign:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 3ad8b790323..3ae47897015 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-10-25 16:26+0000\n" -"Last-Translator: AllanWong <18895563@qq.com>\n" +"PO-Revision-Date: 2012-10-30 16:03+0000\n" +"Last-Translator: ccdos \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-10-31 04:40+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. module: account #: view:account.invoice.report:0 @@ -2330,7 +2330,7 @@ msgstr "筛选" #: selection:report.invoice.created,state:0 #, python-format msgid "Open" -msgstr "打开" +msgstr "待支付" #. module: account #: model:process.node,note:account.process_node_draftinvoices0 @@ -4668,7 +4668,7 @@ msgstr "税适用" #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale #, python-format msgid "Journal Items" -msgstr "会计凭证行" +msgstr "会计凭证明细" #. module: account #: code:addons/account/account.py:1095 @@ -10557,7 +10557,7 @@ msgstr "前景" #. module: account #: view:account.move.line:0 msgid "Search Journal Items" -msgstr "搜索分录" +msgstr "搜索会计凭证明细" #. module: account #: help:account.tax,base_sign:0 diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 41121db20f7..8f525795d1c 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -262,6 +262,7 @@ class account_config_settings(osv.osv_memory): 'sale_tax_rate': config.sale_tax_rate, 'purchase_tax_rate': config.purchase_tax_rate, 'complete_tax_set': config.complete_tax_set, + 'currency_id': config.currency_id.id, }, context) wizard.execute(cr, uid, [wizard_id], context) diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po index eabd2b65207..abc36f292b9 100644 --- a/addons/account_payment/i18n/zh_CN.po +++ b/addons/account_payment/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-10 15:03+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-10-30 15:45+0000\n" +"Last-Translator: ccdos \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-10-31 04:40+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. module: account_payment #: field:payment.order,date_scheduled:0 @@ -653,7 +653,7 @@ msgstr "公司币别" #: view:payment.line:0 #: view:payment.order:0 msgid "Payment" -msgstr "付款" +msgstr "支付" #. module: account_payment #: report:payment.order:0 diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po index e43f9e6d2b8..e608d6dbc1d 100644 --- a/addons/mail/i18n/ru.po +++ b/addons/mail/i18n/ru.po @@ -8,20 +8,20 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-09 00:36+0000\n" -"PO-Revision-Date: 2012-10-26 17:02+0000\n" +"PO-Revision-Date: 2012-10-30 09:52+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-10-31 04:40+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. module: mail #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0 #: field:mail.message.common,subtype:0 msgid "Message Type" -msgstr "" +msgstr "Тип сообщения" #. module: mail #: help:mail.compose.message,auto_delete:0 @@ -51,7 +51,7 @@ msgstr "История общения" #. module: mail #: view:mail.message:0 msgid "Group By..." -msgstr "Объеденить по..." +msgstr "Группировать по ..." #. module: mail #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard @@ -80,7 +80,7 @@ msgstr "Получатели сообщения" #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0 #: field:mail.message.common,body_text:0 msgid "Text Contents" -msgstr "" +msgstr "Текстовое содержимое" #. module: mail #: view:mail.message:0 selection:mail.message,state:0 @@ -196,7 +196,7 @@ msgstr "Получатели" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message msgid "Email composition wizard" -msgstr "" +msgstr "Мастер составления эл. почты" #. module: mail #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0 @@ -219,7 +219,7 @@ msgstr "Ответ:" #: field:mail.compose.message,model:0 field:mail.message,model:0 #: field:mail.message.common,model:0 msgid "Related Document Model" -msgstr "" +msgstr "Модель связанного документа" #. module: mail #: view:mail.message:0 @@ -287,7 +287,7 @@ msgstr "%(sender_name)s написал:" #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0 #: field:mail.message.common,body_html:0 msgid "Rich-text Contents" -msgstr "" +msgstr "Форматированное содержимое" #. module: mail #: field:mail.message,original:0 @@ -359,7 +359,7 @@ msgstr "[OpenERP-Forward-Failed] %s" #. module: mail #: field:mail.message,user_id:0 msgid "Related User" -msgstr "" +msgstr "Относится к пользователю" #. module: mail #: help:mail.compose.message,headers:0 help:mail.message,headers:0 @@ -454,7 +454,7 @@ msgstr "Сообщения" #: field:mail.compose.message,headers:0 field:mail.message,headers:0 #: field:mail.message.common,headers:0 msgid "Message Headers" -msgstr "" +msgstr "Заголовки сообщений" #. module: mail #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0 diff --git a/addons/project/project.py b/addons/project/project.py index 3b0057c67b7..66d63fc2c12 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -178,7 +178,18 @@ class project(osv.osv): res = super(project, self).unlink(cr, uid, ids, *args, **kwargs) mail_alias.unlink(cr, uid, alias_ids, *args, **kwargs) return res - + + def _get_attached_docs(self, cr, uid, ids, field_name, arg, context): + res = {} + attachment = self.pool.get('ir.attachment') + task = self.pool.get('project.task') + for id in ids: + project_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.project'), ('res_id', 'in', [id])], context=context, count=True) + task_ids = task.search(cr, uid, [('project_id', 'in', [id])], context=context) + task_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)], context=context, count=True) + res[id] = project_attachments or 0 + task_attachments or 0 + return res + def _task_count(self, cr, uid, ids, field_name, arg, context=None): res = dict.fromkeys(ids, 0) task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)]) @@ -189,7 +200,26 @@ class project(osv.osv): def _get_alias_models(self, cr, uid, context=None): """Overriden in project_issue to offer more options""" return [('project.task', "Tasks")] - + + def attachment_tree_view(self, cr, uid, ids, context): + task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)]) + domain = [ + ('|', + '&', 'res_model', '=', 'project.project'), ('res_id', 'in', ids), + '&', ('res_model', '=', 'project.task'), ('res_id', 'in', task_ids) + ] + res_id = ids and ids[0] or False + return { + 'name': _('Attachments'), + 'domain': domain, + 'res_model': 'ir.attachment', + 'type': 'ir.actions.act_window', + 'view_id': False, + 'view_mode': 'tree,form', + 'view_type': 'form', + 'limit': 80, + 'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id) + } # Lambda indirection method to avoid passing a copy of the overridable method when declaring the field _alias_models = lambda self, *args, **kwargs: self._get_alias_models(*args, **kwargs) _columns = { @@ -232,6 +262,7 @@ class project(osv.osv): help="The kind of document created when an email is received on this project's email alias"), 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True), 'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,), + 'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int') } def _get_type_common(self, cr, uid, context): @@ -728,11 +759,11 @@ class task(base_stage, osv.osv): If the case needs to be reviewed then the status is \ set to \'Pending\'.'), 'categ_ids': fields.many2many('project.category', string='Tags'), - 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', + 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', help="A task's kanban state indicates special situations affecting it:\n" " * Normal is the default situation\n" " * Blocked indicates something is preventing the progress of this task\n" - " * Ready To Pull indicates the task is ready to be pulled to the next stage", + " * Ready for next stage indicates the task is ready to be pulled to the next stage", readonly=True, required=False), 'create_date': fields.datetime('Create Date', readonly=True,select=True), 'date_start': fields.datetime('Starting Date',select=True), @@ -792,6 +823,11 @@ class task(base_stage, osv.osv): """ return self.write(cr, uid, ids, {'priority' : priority}) + def set_very_high_priority(self, cr, uid, ids, *args): + """Set task priority to very high + """ + return self.set_priority(cr, uid, ids, '0') + def set_high_priority(self, cr, uid, ids, *args): """Set task priority to high """ @@ -1398,7 +1434,7 @@ class project_task_history(osv.osv): 'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True), 'type_id': fields.many2one('project.task.type', 'Stage'), 'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'Status'), - 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', required=False), + 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', required=False), 'date': fields.date('Date', select=True), 'end_date': fields.function(_get_date, string='End Date', type="date", store={ 'project.task.history': (_get_related_date, None, 20) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 29be26bc127..93bf3a051ee 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -63,8 +63,8 @@
-
@@ -403,12 +407,15 @@ + + groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/> @@ -458,9 +465,6 @@ - @@ -525,10 +529,11 @@
- + - 7 - 7 + 7 + 7 + 7
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 8381e6d68d3..9fd833e9424 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -2,6 +2,21 @@ margin: 2px; } +.openerp .oe_kanban_view .oe_kanban_content .oe_star_very_high_priority { + color: #cccccc; + text-shadow: 0 0 2px black; + vertical-align: top; + position: relative; + top: -5px; +} +.openerp .oe_kanban_view .oe_kanban_content .oe_star_very_high_priority:hover { + text-decoration: none; +} + +.openerp .oe_kanban_view .oe_kanban_content .oe_star_very_high_priority { + color: red; +} + .oe_kanban_project { width: 220px; min-height: 160px; diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 194cc186f27..59eeba4d191 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -57,6 +57,12 @@ openerp.project = function(openerp) { } else if (self.dataset.model === 'project.task') { self.project_display_categ_names(); } + }, + on_record_moved: function(record, old_group, old_index, new_group, new_index){ + var self = this; + this._super.apply(this, arguments); + if(new_group.state.folded) + new_group.do_action_toggle_fold(); } }); @@ -67,6 +73,10 @@ openerp.project = function(openerp) { } else { this._super.apply(this, arguments); } - } + }, + bind_events: function() { + this._super(); + this.view.project_display_categ_names(); + }, }); }; diff --git a/addons/sale_stock/i18n/zh_CN.po b/addons/sale_stock/i18n/zh_CN.po index d87aeb77d48..9727dbb5f99 100644 --- a/addons/sale_stock/i18n/zh_CN.po +++ b/addons/sale_stock/i18n/zh_CN.po @@ -7,21 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-09-20 07:32+0000\n" -"PO-Revision-Date: 2012-10-25 17:47+0000\n" -"Last-Translator: ccdos \n" +"PO-Revision-Date: 2012-10-30 16:29+0000\n" +"Last-Translator: ccdos \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-10-31 04:41+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. module: sale_stock #: help:sale.config.settings,group_invoice_deli_orders:0 msgid "" "To allow your salesman to make invoices for Delivery Orders using the menu " "'Deliveries to Invoice'." -msgstr "" +msgstr "允许销售员 使用菜单“按已交付数量开票” 根据发运单开发票" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:496 @@ -77,7 +77,7 @@ msgstr "调拨出去或调拨给客户的单据" #. module: sale_stock #: field:sale.config.settings,group_multiple_shops:0 msgid "Manage multiple shops" -msgstr "" +msgstr "管理多个商店" #. module: sale_stock #: model:process.transition.action,name:sale_stock.process_transition_action_validate0 @@ -280,7 +280,7 @@ msgstr "默认选项" #. module: sale_stock #: field:sale.config.settings,module_project_mrp:0 msgid "Project MRP" -msgstr "" +msgstr "项目MRP" #. module: sale_stock #: help:sale.order.line,type:0 @@ -314,7 +314,7 @@ msgstr "已送货" msgid "" "To allow your salesman to make invoices for sale order lines using the menu " "'Lines to Invoice'." -msgstr "" +msgstr "允许销售员 使用菜单“逐行开票” 根据销售单明细逐行开发票" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:260 @@ -350,7 +350,7 @@ msgstr "允许追加运输成本" #. module: sale_stock #: view:sale.order:0 msgid "days" -msgstr "" +msgstr "天数" #. module: sale_stock #: field:sale.order.line,product_packaging:0 @@ -371,7 +371,7 @@ msgstr "允许开发运单" #: code:addons/sale_stock/sale_stock.py:689 #, python-format msgid "Advance of %s %%" -msgstr "" +msgstr "%s %% 的预付款" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:601 @@ -465,7 +465,7 @@ msgstr "编号必须在公司内唯一！" #: code:addons/sale_stock/sale_stock.py:698 #, python-format msgid "Advance of %s %s" -msgstr "" +msgstr "%s %s 的预付款" #. module: sale_stock #: model:process.node,note:sale_stock.process_node_saleprocurement0 @@ -559,7 +559,7 @@ msgstr "生成发票" #. module: sale_stock #: help:sale.config.settings,group_mrp_properties:0 msgid "Allows you to tag sale order lines with properties." -msgstr "" +msgstr "允许你用 属性 来标记销售订单 明细" #. module: sale_stock #: field:sale.config.settings,task_work:0 @@ -591,13 +591,13 @@ msgstr "贸易术语" #. module: sale_stock #: constraint:stock.move:0 msgid "You try to assign a lot which is not from the same product." -msgstr "" +msgstr "您企图为不一样的产品创建批号" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:659 #, python-format msgid "Cannot cancel sales order line!" -msgstr "" +msgstr "不能取消销售订单明细" #. module: sale_stock #: view:sale.order:0 @@ -637,14 +637,14 @@ msgstr "公司名必须唯一！" #. module: sale_stock #: model:ir.model,name:sale_stock.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: sale_stock #: help:sale.order,picking_ids:0 msgid "" "This is a list of delivery orders that has been generated for this sales " "order." -msgstr "" +msgstr "这是一个销售订单生产的发运单列表" #. module: sale_stock #: model:process.node,name:sale_stock.process_node_saleorderprocurement0 @@ -674,12 +674,12 @@ msgstr "" #. module: sale_stock #: view:sale.order:0 msgid "Recreate Delivery Order" -msgstr "" +msgstr "重建发运单" #. module: sale_stock #: help:sale.config.settings,group_multiple_shops:0 msgid "This allows to configure and use multiple shops." -msgstr "" +msgstr "允许配置和使用多个商店" #. module: sale_stock #: field:sale.order,picked_rate:0 diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po index 140a5a1970e..62f076166cb 100644 --- a/addons/stock_location/i18n/it.po +++ b/addons/stock_location/i18n/it.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2011-01-12 19:03+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-10-30 22:46+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-10-31 04:40+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. module: stock_location #: selection:product.pulled.flow,picking_type:0 @@ -164,7 +164,7 @@ msgstr "Azienda" #. module: stock_location #: view:product.product:0 msgid "Logistics Flows" -msgstr "" +msgstr "Flussi logistici" #. module: stock_location #: help:stock.move,cancel_cascade:0