diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index ac17ec4d170..823bb56a7a9 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -32,7 +32,7 @@ Customer and Supplier Invoices Bank statements Reconciliation process by partner - Creates a dashboards for accountants that includes: + Creates a dashboard for accountants that includes: * List of uninvoiced quotations * Graph of aged receivables * Graph of aged incomes diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py index 3df4fd9584b..8050b62753f 100644 --- a/addons/account/project/report/analytic_balance.py +++ b/addons/account/project/report/analytic_balance.py @@ -19,7 +19,6 @@ # ############################################################################## -import pooler import time from report import report_sxw @@ -43,7 +42,6 @@ class account_analytic_balance(report_sxw.rml_parse): self.acc_sum_list = []# maintains a list of all ids def get_children(self, ids): - ids2 = [] read_data = self.pool.get('account.analytic.account').read(self.cr, self.uid, ids,['child_ids','code','complete_name','balance']) for data in read_data: if (data['id'] not in self.acc_ids): @@ -54,7 +52,7 @@ class account_analytic_balance(report_sxw.rml_parse): self.acc_ids.append(data['id']) self.read_data.append(data) if data['child_ids']: - res = self.get_children(data['child_ids']) + self.get_children(data['child_ids']) return True diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index 4fe89534ce5..479afd2f2e2 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -50,7 +50,7 @@ !assert {model: account.invoice, id: account_invoice_currency}: - state == 'proforma2' - - I can't change the currency of invoice when it is not in draft state so i change the state to cancel + I can't change the currency of invoice when it is not in draft state so I change the state to cancel - !workflow {model: account.invoice, action: invoice_cancel, ref: account_invoice_currency} - diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index bd9af0f2a34..7e4295da45b 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -1,5 +1,5 @@ - - In order to test the PDF reports defined on an invoice, we will print an invoice + In order to test the PDF reports defined on an invoice, we will print an Invoice Report - !python {model: account.invoice}: | import netsvc, tools, os diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml index 3be824d2ca0..4748175c118 100644 --- a/addons/account/test/account_sequence_test.yml +++ b/addons/account/test/account_sequence_test.yml @@ -32,7 +32,7 @@ reference_type: none period_id: period_1 -- I create the invoice, as is I clicked on the "Create" button +- I create the invoice, as I clicked on the "Create" button - !workflow {model: account.invoice, action: invoice_open, ref: invoice_seq_test} - I check that the invoice state is "Open" diff --git a/addons/account/test/test_parent_structure.yml b/addons/account/test/test_parent_structure.yml index aed40e6f0f3..3c4db5c3ff4 100644 --- a/addons/account/test/test_parent_structure.yml +++ b/addons/account/test/test_parent_structure.yml @@ -1,5 +1,5 @@ - - We retrieve all accounts and test they are in a tree data structure. + We retrieve all accounts and test that those are in a tree data structure. - !python {model: account.account}: | ids = self.search(cr, uid, []) diff --git a/addons/account_analytic_plans/test/acount_analytic_plans_report.yml b/addons/account_analytic_plans/test/acount_analytic_plans_report.yml index debeba7daa0..0990b9ba5f9 100644 --- a/addons/account_analytic_plans/test/acount_analytic_plans_report.yml +++ b/addons/account_analytic_plans/test/acount_analytic_plans_report.yml @@ -1,5 +1,5 @@ - - Print the Cross Overed Report in Normal mode + Print the Crossovered Analytic Report in Normal mode - !python {model: account.analytic.account}: | import netsvc, tools, os, time diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index 5d6d8da0def..4fd24da70e9 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -26,7 +26,7 @@ 'category': 'Generic Modules/Accounting', 'description': """This module allows accountants to manage analytic and crossovered budgets. -Once the Master Budgets and the Budgets defined (in Financial +Once the Master Budgets and the Budgets are defined (in Financial Management/Budgets/), the Project Managers can set the planned amount on each Analytic Account. diff --git a/addons/account_budget/test/account_budget.yml b/addons/account_budget/test/account_budget.yml index f77efa23b15..4a2d5023fc7 100644 --- a/addons/account_budget/test/account_budget.yml +++ b/addons/account_budget/test/account_budget.yml @@ -1,5 +1,5 @@ - - In order to check account budget module in OpenERP I created a budget with few budget position + In order to check account budget module in OpenERP I created a budget with few budget positions - Creating a crossovered.budget record - @@ -58,7 +58,7 @@ - state == 'validate' - - I pressed the done button to done the Budget + I pressed the done button to set the Budget to "Done" state - Performing a workflow action done on module crossovered.budget - diff --git a/addons/account_budget/test/account_budget_report.yml b/addons/account_budget/test/account_budget_report.yml index fa086e24a64..2115341c1a1 100644 --- a/addons/account_budget/test/account_budget_report.yml +++ b/addons/account_budget/test/account_budget_report.yml @@ -17,7 +17,7 @@ if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account_budget-budget_report.'+format), 'wb+').write(data) - - Print the Cross Overed Budget Report in Normal mode + Print the CrossOvered Budget Report in Normal mode - !python {model: crossovered.budget}: | import netsvc, tools, os, time diff --git a/addons/account_budget/test/account_budget_spread.yml b/addons/account_budget/test/account_budget_spread.yml index 98d85222859..c996c647025 100644 --- a/addons/account_budget/test/account_budget_spread.yml +++ b/addons/account_budget/test/account_budget_spread.yml @@ -1,5 +1,5 @@ - - In order to test Spread Wizard of account module I spread record with amount=1000 + In order to test Spread Wizard of account_budget module I spread record with amount=1000 - Creating a account.budget.spread record - @@ -9,7 +9,7 @@ - - Performing an osv_memory action check_spread on module account.budget.spread + Performing an osv_memory action check_spread on model account.budget.spread - !python {model: account.budget.spread}: | self.check_spread(cr, uid, [ref("account_budget_spread_0")], {"lang": 'en_US', diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index ea2f79c967d..ae6fb8e4fce 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -27,18 +27,18 @@ Modules to automate letters for unpaid invoices, with multi-level recalls. You can define your multiple levels of recall through the menu: - Financial Management/Configuration/Follow-Ups + Accounting/Configuration/Miscellaneous/Follow-Ups - Once it's defined, you can automatically print recalls every day + Once it is defined, you can automatically print recalls every day through simply clicking on the menu: - Financial Management/Periodical Processing/Send followups + Accounting/Periodical Processing/Billing/Send followups - It will generate a PDF with all the letters according the the + It will generate a PDF with all the letters according to the the different levels of recall defined. You can define different policies - for different companies. You can send also mail to the customer. + for different companies. You can also send mail to the customer. - Note that if you want to change the followup level for a given partner/account entry, you can do it in the menu: - Accounting/Reporting/Follow-Ups/All receivable entries + Note that if you want to change the followup level for a given partner/account entry, you can do from in the menu: + Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups Sent """, 'author': 'OpenERP SA', diff --git a/addons/account_followup/report/report_followp_print.rml b/addons/account_followup/report/report_followp_print.rml index 13230f246fd..32bd8103a1c 100644 --- a/addons/account_followup/report/report_followp_print.rml +++ b/addons/account_followup/report/report_followp_print.rml @@ -203,7 +203,7 @@ [[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]] - [[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]/para> + [[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]] [[ formatLang(reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]] [[ company.currency_id.symbol ]] diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml index 0a47ddad116..a81559011f3 100644 --- a/addons/account_followup/test/account_followup.yml +++ b/addons/account_followup/test/account_followup.yml @@ -101,11 +101,3 @@ "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")], "tz": False, "date": "2010-06-08", "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"), }) - - - - - - - - diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index 0e17cfeef68..f92cd477f1a 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -477,7 +477,7 @@ - [[ format((o.payment_term and o.payment_term.note or '') or removeParentNode('blockTable')) ]] + [[ o.payment_term and o.payment_term.name + " :\n" + format(o.payment_term.note or '') or removeParentNode('blockTable') ]] diff --git a/addons/account_report/__openerp__.py b/addons/account_report/__openerp__.py index b8029bf3563..57db73ce6ff 100644 --- a/addons/account_report/__openerp__.py +++ b/addons/account_report/__openerp__.py @@ -27,7 +27,7 @@ 'description': """Financial and accounting reporting Fiscal statements Indicators - Add a dashboards for accountant that include Indicators reporting. + Adds a dashboard for accountant that include Indicators reporting. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py index f1e6c3dfb74..a6bab18ce01 100644 --- a/addons/account_tax_include/__openerp__.py +++ b/addons/account_tax_include/__openerp__.py @@ -27,7 +27,7 @@ 'description': """Allow the user to work tax included prices. Especially useful for b2c businesses. -This module implement the modification on the invoice form. +This module implements the modification on the invoice form. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml index b63bfc9d129..424ec0e5cc7 100644 --- a/addons/account_voucher/test/account_voucher.yml +++ b/addons/account_voucher/test/account_voucher.yml @@ -23,7 +23,7 @@ !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}: - state == 'draft' - - I compute the voucher to calculate the taxes by clicking Cpmpute button + I compute the voucher to calculate the taxes by clicking Compute button - !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0} - diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index eb9ac398500..2b73dd69885 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -20,7 +20,6 @@ ############################################################################## from osv import fields, osv -import pooler class profile_association_config_install_modules_wizard(osv.osv_memory): _name='profile.association.config.install_modules_wizard' diff --git a/addons/auction/auction.py b/addons/auction/auction.py index a1fb726339e..834e7e9b150 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -646,7 +646,6 @@ class auction_lots(osv.osv): if not context: context={} inv_ref=self.pool.get('account.invoice') - partner_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') for lot in self.browse(cr, uid, ids, context): @@ -655,7 +654,6 @@ class auction_lots(osv.osv): if lot.bord_vnd_id.id in invoices: inv_id = invoices[lot.bord_vnd_id.id] else: - res = partner_obj.address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice']) inv = { 'name': 'Auction:' +lot.name, 'journal_id': lot.auction_id.journal_seller_id.id, diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml index 6d07f5fc0a5..bbab6786e27 100644 --- a/addons/auction/test/auction.yml +++ b/addons/auction/test/auction.yml @@ -25,12 +25,12 @@ name: Vincent van Gogh - - I modifying a expenses journal record for analytic journal. + I am modifying an expenses journal record for analytic journal. - !record {model: account.journal, id: account.expenses_journal}: analytic_journal_id: account.exp - - I modifying a sales journal record for analytic journal. + I am modifying a sales journal record for analytic journal. - !record {model: account.journal, id: account.sales_journal}: analytic_journal_id: account.cose_journal_sale @@ -49,7 +49,7 @@ name: Mr. Pinakin - - I'm creating new Buyer "Mr. Patel" with him email "info@myinfobid.com". + I'm creating new Buyer "Mr. Patel" with his email "info@myinfobid.com". - !record {model: res.partner, id: res_partner_mrpatel0}: address: @@ -62,7 +62,7 @@ name: Mr. Patel - - I'm creating new Buyer "Mr. Johnson" with him email "info@mrkjohnson.com". + I'm creating new Buyer "Mr. Johnson" with his email "info@mrkjohnson.com". - !record {model: res.partner, id: res_partner_mrkjohnson0}: address: @@ -76,7 +76,7 @@ name: Mr. Mark Johnson - - I'm creating new Buyer "Mr. Rahi" with him email "info@poalrahi.com". + I'm creating new Buyer "Mr. Rahi" with his email "info@poalrahi.com". - !record {model: res.partner, id: res_partner_poalrahi0}: address: @@ -90,7 +90,7 @@ - - I create Account tax with 0.03 amount to give Buyer "3%" Commision. + I create an Account tax with 0.03 amount to give Buyer "3%" Commission. - !record {model: account.tax, id: account_tax_buyer0}: amount: 0.029999999999999999 @@ -102,7 +102,7 @@ type: percent type_tax_use: all - - I create Account tax with 0.04 amount to give seller "4%" commision. + I create another Account tax with 0.04 amount to give seller "4%" commission. - !record {model: account.tax, id: account_tax_sellercosts0}: amount: 0.040000000000000001 @@ -116,7 +116,7 @@ - Now I want to associate an object with the auction so for that I create an auction "Antique furniture exhibition" which - start from 1 Aug to 31 Aug with Seller Commition 4%, buyer commition 3%. + start from 1 Aug to 31 Aug with Seller Commission 4%, buyer commission 3%. - !record {model: auction.dates, id: auction_dates_antiquefurnitureexhibition0}: acc_expense: account.a_pay @@ -165,7 +165,7 @@ state: draft vnd_lim: 5000.0 - - I create a bid for an object "wooden-chair" which is to be auctioned in Antique furniture exhibition bided by Mr.Patel. + I create a bid for an object "wooden-chair" which is to be auctioned in Antique furniture exhibition bid by Mr.Patel. - !record {model: auction.bid, id: auction_bid_bid0}: auction_id: auction_dates_antiquefurnitureexhibition0 @@ -182,7 +182,7 @@ price: 3100.0 - - I create another bid for an object "wooden-chair" bided by a Mr.poalrahi + I create another bid for an object "wooden-chair" bid by a Mr.poalrahi - !record {model: auction.bid, id: auction_bid_bid1}: auction_id: auction_dates_antiquefurnitureexhibition0 @@ -199,7 +199,7 @@ price: 3200.0 - - I create another bid for an object "wooden-chair" bided by a Mr.Johnson + I create another bid for an object "wooden-chair" bid by a Mr.Johnson - !record {model: auction.bid, id: auction_bid_bid2}: auction_id: auction_dates_antiquefurnitureexhibition0 @@ -215,9 +215,9 @@ lot_id: auction.auction_lots_woodenchair0 price: 4000.0 - - Mr. MarkJohnson bid are selected as Finallist Bid with 4000 Euro + Mr. MarkJohnson bid are selected as the Finalist Bid with 4000 Euro - - I check that buyer price and seller price gets bind with the value + I check that buyer price and seller price gets bound with the value - !python {model: auction.lots}: | from tools.translate import _ @@ -254,13 +254,13 @@ number: 2010/003 objects: 1 - - Then I click on the "Create Invoices" button. + I click on the "Create Invoices" button. - !python {model: auction.lots.make.invoice.buyer}: | self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_buyer_0")], {"active_model": "auction.lots", "active_ids": [ref("auction_lots_woodenchair0")], "active_id": ref("auction_lots_woodenchair0"), }) - - I check that a "Buyer Invoice" field gets bind with the value. + I check that a "Buyer Invoice" field gets bound with the value. - !python {model: auction.lots}: | from tools.translate import _ @@ -289,7 +289,7 @@ auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0")) assert(auc_id.state == 'sold'), _('State not changed!') - - Then I click on the Taken Away button. + I click on the Taken Away button. - !python {model: auction.lots}: | self.button_taken_away(cr, uid, [ref("auction_lots_woodenchair0")], {"lang": @@ -307,7 +307,7 @@ !record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}: auction_id: auction.auction_date_2 - - Then I click on the "Move to Auction date" button. + I click on the "Move to Auction date" button. - !python {model: auction.lots.auction.move}: | self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang": diff --git a/addons/auction/test/auction_report.yml b/addons/auction/test/auction_report.yml index 0219af369b4..962c945f366 100644 --- a/addons/auction/test/auction_report.yml +++ b/addons/auction/test/auction_report.yml @@ -1,5 +1,5 @@ - - In order to test the PDF reports defined on auction, we will print a auction artist + In order to test the PDF reports defined on Auction, we will print an Auction Artist Report - !python {model: auction.lots}: | import netsvc, tools, os @@ -8,7 +8,7 @@ file(os.path.join(tools.config['test_report_directory'], 'auction-auction_artist_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print a auction Bid + In order to test the PDF reports defined on Auction, we will print an Auction Bid Report - !python {model: auction.bid}: | import netsvc, tools, os @@ -17,61 +17,61 @@ file(os.path.join(tools.config['test_report_directory'], 'auction-auction_bid_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print a lots list Report + In order to test the PDF reports defined on Auction, we will print a Lots List Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.lots.list').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_3_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lots_list_report.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-lots_list_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print a lots inventory Report + In order to test the PDF reports defined on Auction, we will print a Lots Inventory Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.lots.list.inventory').create(cr, uid, [ref('auction.auction_deposit_4_lot_1'),ref('auction.auction_deposit_4_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lots_inventory_report.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-lots_inventory_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print a deposit seller Report + In order to test the PDF reports defined on Auction, we will print a Deposit Seller Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.deposit.seller').create(cr, uid, [ref('auction.auction_deposit_5_lot_1'),ref('auction.auction_deposit_5_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_deposit_seller_report.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-deposit_seller_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print a catalog + In order to test the PDF reports defined on Auction, we will print a Catalogue List Report - !python {model: auction.dates}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.auction.cat_flagy').create(cr, uid, [ref('auction.auction_date_1'),ref('auction.auction_date_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_catalog_list.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-catalog_list_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print buyer form report + In order to test the PDF reports defined on Auction, we will print a Buyer Form Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.buyer_form_report').create(cr, uid, [ref('auction.auction_deposit_6_lot_1'),ref('auction.auction_deposit_6_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_buyer_form.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_form_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on auction, we will print bids phones report + In order to test the PDF reports defined on Auction, we will print a report of Bids Phones Details - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.bids.phones.details').create(cr, uid, [ref('auction.auction_deposit_7_lot_1'),ref('auction.auction_deposit_7_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_bids_phones_details.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-bids_phones_details_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a auction, we will print a Auction Total + In order to test the PDF reports defined on Auction, we will print an Auction Total Report - !python {model: auction.lots}: | import netsvc, tools, os @@ -80,7 +80,7 @@ file(os.path.join(tools.config['test_report_directory'], 'auction-auction_total_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a auction, we will print a Auction Result + In order to test the PDF reports defined on Auction, we will print an Auction Result Report - !python {model: auction.lots}: | import netsvc, tools, os @@ -89,7 +89,7 @@ file(os.path.join(tools.config['test_report_directory'], 'auction-auction_result_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a auction, we will print a Auction Lot + In order to test the PDF reports defined on Auction, we will print an Auction Lot Report - !python {model: auction.lots}: | import netsvc, tools, os @@ -98,28 +98,44 @@ file(os.path.join(tools.config['test_report_directory'], 'auction-auction_lot_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a auction, we will print a Auction Buyer list report + In order to test the PDF reports defined on Auction, we will print an Auction Buyer List Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.buyer.list').create(cr, uid, [ref('auction.auction_deposit_10_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_buyer_list_report.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_list_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a auction, we will print a Auction Flagey Hussier report + In order to test the PDF reports defined on Auction, we will print an Auction Flagey Hussier Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.flagey.huissier').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_flagey_hussier_report.'+format), 'wb+').write(data) + file(os.path.join(tools.config['test_report_directory'], 'auction-flagey_hussier_report.'+format), 'wb+').write(data) - - In order to test the PDF reports defined on a auction, we will print Auction Seller Form report + In order to test the PDF reports defined on Auction, we will print an Auction Seller Form Report - !python {model: auction.lots}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.seller_form_report').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'auction-auction_seller_form_report.'+format), 'wb+').write(data) \ No newline at end of file + file(os.path.join(tools.config['test_report_directory'], 'auction-seller_form_report.'+format), 'wb+').write(data) +- + In order to test the PDF reports defined on Auction, we will a print Buyer Result Report +- + !python {model: auction.lots}: | + import netsvc, tools, os + (data, format) = netsvc.LocalService('report.auction.buyer.result').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {}) + if tools.config['test_report_directory']: + file(os.path.join(tools.config['test_report_directory'], 'auction-buyer_result_report.'+format), 'wb+').write(data) +- + In order to test the PDF reports defined on Auction, we will print a Catalogue Report +- + !python {model: auction.lots}: | + import netsvc, tools, os + (data, format) = netsvc.LocalService('report.auction.catelog').create(cr, uid, [ref('auction.auction_deposit_3_lot_1'),ref('auction.auction_deposit_10_lot_2')], {}, {}) + if tools.config['test_report_directory']: + file(os.path.join(tools.config['test_report_directory'], 'auction-catelog_report.'+format), 'wb+').write(data) \ No newline at end of file diff --git a/addons/auction/test/auction_wizard.yml b/addons/auction/test/auction_wizard.yml index f7308f8687c..bfe4f353ed5 100644 --- a/addons/auction/test/auction_wizard.yml +++ b/addons/auction/test/auction_wizard.yml @@ -81,7 +81,7 @@ "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")], "active_id": ref("auction_lots_painting0")}) - - I check that the buyer field gets bind with the value. + I check that the buyer field gets bound with the value. - !python {model: auction.lots}: | from tools.translate import _ @@ -89,7 +89,7 @@ assert(auc_id.ach_uid), _('Buyer not assigned!') - - I create statement lines for an object's payment by using the "Pay objects of the buyer" wizard + I create statement lines for the payment of an object using the "Pay objects of the buyer" wizard - I create a bank statement. - @@ -113,7 +113,7 @@ statement_id3: account_bank_statement_st0 total: 4000.0 - - Then I click "Pay" button. + I click "Pay" button. - !python {model: auction.pay.buy}: | self.pay_and_reconcile(cr, uid, [ref("auction_pay_buy_0")], {"lang": "en_US", "tz": @@ -135,14 +135,14 @@ number: 2010/002 objects: 1 - - Then I click on the "Create Invoices" button. + I click on the "Create Invoices" button. - !python {model: auction.lots.make.invoice}: | self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_0")], {"lang": "en_US", "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")], "tz": False, "active_id": ref("auction_lots_painting0"),}) - - I check that a "Seller Invoice" field gets bind with the value. + I check that a "Seller Invoice" field gets bound with the value. - !python {model: auction.lots}: | from tools.translate import _ @@ -157,14 +157,14 @@ number: 2010/003 objects: 1 - - Then I click on the "Create Invoices" button. + I click on the "Create Invoices" button. - !python {model: auction.lots.make.invoice.buyer}: | self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_buyer_0")], {"lang": "en_US", "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")], "tz": False, "active_id": ref("auction_lots_painting0"), }) - - I check that a "Buyer Invoice" field gets bind with the value. + I check that a "Buyer Invoice" field gets bound with the value. - !python {model: auction.lots}: | from tools.translate import _ @@ -176,7 +176,7 @@ !record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}: auction_id: auction.auction_date_2 - - Then I click on the "Move to Auction date" button. + I click on the "Move to Auction date" button. - !python {model: auction.lots.auction.move}: | self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang": diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py index e660b418aa3..c9164bfd839 100644 --- a/addons/audittrail/__openerp__.py +++ b/addons/audittrail/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.0', 'category': 'Generic Modules/Others', 'description': """ - This module gives the administrator the right + This module gives the administrator the rights to track every user operation on all the objects of the system. diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml index 5ea382babb4..a9a1c039e62 100644 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/addons/base_calendar/test/base_calendar_test.yml @@ -12,18 +12,18 @@ name: Technical Presentation rrule_type: none - | - Now I will set recurrence for this event to occure monday and friday of week + Now I will set recurrence for this event to occur monday and friday of week - !python {model: calendar.event}: | self.write(cr, uid, [ref("calendar_event_technicalpresentation0")], {'fr': 1, 'mo': 1, 'interval': 1, 'freq': 'weekly', 'rrule_type': 'custom'}) - | - In order to check that recurrent events are views successfully in calenadar view, + In order to check that recurrent events are views successfully in calendar view, I will open calendar view of events - !python {model: calendar.event}: | self.fields_view_get(cr, uid, False, 'calendar', context) - | - In order to check that recurrent events are views successfully in calenadar view, + In order to check that recurrent events are views successfully in calendar view, I will search for one of the recurrent event and count the number of events - !python {model: calendar.event}: | diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py index 8a7fe96b6bd..9a2e33240ac 100644 --- a/addons/base_module_doc_rst/__openerp__.py +++ b/addons/base_module_doc_rst/__openerp__.py @@ -24,10 +24,10 @@ 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ - * This module generate the Technical Guides of selected modules in Restructured Text format (RST) + * This module generates the Technical Guides of selected modules in Restructured Text format (RST) * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST * It creates a tarball (.tgz file suffix) containing an index file and one file per module - * Generate Relationship Graph + * Generates Relationship Graph """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py index 53e2d0ebb24..a53dde3afe3 100644 --- a/addons/base_module_quality/__openerp__.py +++ b/addons/base_module_quality/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.0', 'category': 'OpenERP SA Specific Modules/Base module quality', 'description': """ -This module's aim is to check the quality of other modules. +The aim of this module is to check the quality of other modules. It defines a wizard on the list of modules in OpenERP, which allows you to evaluate them on different criteria such as: the respect of OpenERP coding diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py index 5c6eaa5f712..4d3256dc44d 100644 --- a/addons/base_module_record/__openerp__.py +++ b/addons/base_module_record/__openerp__.py @@ -39,7 +39,7 @@ for custom configurations and demo/testing data. How to use it: Run Administration/Customization/Module Creation/Export Customizations As a Module wizard. -Select datetime critearia of recording and objects to be recorded and Record module. +Select datetime criteria of recording and objects to be recorded and Record module. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py index ab148f97494..0dbeac6e806 100644 --- a/addons/base_vat/__openerp__.py +++ b/addons/base_vat/__openerp__.py @@ -26,7 +26,7 @@ Enable the VAT Number for the partner. Check the validity of that VAT Number. This module follows the methods stated at http://sima-pc.com/nif.php for - checking the validity of VAT Number assinged to partners in European countries. + checking the validity of VAT Number assigned to partners in European countries. """, 'author': 'OpenERP SA', 'depends': ['account'], diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py index 55be22f198e..11f720bdcab 100644 --- a/addons/caldav/caldav_node.py +++ b/addons/caldav/caldav_node.py @@ -19,10 +19,6 @@ # ############################################################################## -from osv import osv, fields -from tools.translate import _ -import pooler -import tools import time from document import nodes import StringIO @@ -141,7 +137,6 @@ class node_calendar(nodes.node_class): return str(result) def _get_dav_dropbox_home_URL(self, cr): - import xml.dom.minidom import urllib uid = self.context.uid ctx = self.context.context.copy() @@ -153,7 +148,6 @@ class node_calendar(nodes.node_class): return url def _get_dav_notification_URL(self, cr): - import xml.dom.minidom import urllib uid = self.context.uid ctx = self.context.context.copy() @@ -308,7 +302,8 @@ class node_calendar(nodes.node_class): calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) return calendar.description - def _get_dav_principal_collection_set(self, uri): + def _get_dav_principal_collection_set(self, cr): + import xml import urllib uid = self.context.uid ctx = self.context.context.copy() @@ -341,7 +336,6 @@ class node_calendar(nodes.node_class): def _get_caldav_calendar_user_address_set(self, cr): import xml.dom.minidom - dirobj = self.context._dirobj uid = self.context.uid ctx = self.context.context.copy() ctx.update(self.dctx) @@ -410,7 +404,6 @@ class res_node_calendar(nodes.node_class): self.res_id = res_id def open(self, cr, mode=False): - uid = self.context.uid if self.type in ('collection','database'): return False s = StringIO.StringIO(self.get_data(cr)) diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index 4f9afb034a4..88b0549a3de 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -293,7 +293,6 @@ class CalDAV(object): att_data = [] exdates = [] - _server_tzinfo = pytz.timezone(tools.get_server_timezone()) for cal_data in child.getChildren(): if cal_data.name.lower() == 'organizer': @@ -521,7 +520,7 @@ class CalDAV(object): ical = vobject.iCalendar() self.create_ics(cr, uid, datas, vobj, ical, context=context) return ical - except Exception, e: + except: raise # osv.except_osv(('Error !'), (str(e))) def import_cal(self, cr, uid, content, data_id=None, context=None): @@ -654,7 +653,7 @@ class Calendar(CalDAV, osv.osv): data_id = self.search(cr, uid, [])[0] cal = self.browse(cr, uid, data_id, context=context) cal_children = {} - count = 0 + for line in cal.line_ids: cal_children[line.name] = line.object_id.model objs = [] diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 9b4f9e2ef96..c6f7759859c 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -20,8 +20,6 @@ ############################################################################## import time -from datetime import datetime -from datetime import timedelta import base64 import tools from osv import fields @@ -431,7 +429,7 @@ class crm_case(object): # Send an email subject = "Reminder: [%s] %s" % (str(case.id), case.name, ) - flag = tools.email_send( + tools.email_send( src, [dest], subject, diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 3860a69b51c..32551d438c4 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -20,12 +20,7 @@ ############################################################################## from lxml import etree -from operator import itemgetter from osv import fields, osv -import netsvc -import os -import pooler -import tools class crm_installer(osv.osv_memory): _name = 'crm.installer' diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index fa53a373575..71d19b3d6f1 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -45,7 +45,6 @@ class crm_lead_report(osv.osv): @param context: A standard dictionary for contextual values """ res = {} - state_perc = 0.0 avg_ans = 0.0 for case in self.browse(cr, uid, ids, context): diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 99667400043..d35b8aea295 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -204,7 +204,7 @@ form {'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} tree,graph - [] + [('type', '=', 'lead')] Leads Analysis allows you to consult different informations relative to CRM. Check for treatments delays, number of responses given and emails send. You can sort out your leads analysis on different groups to get fine grained analysis. @@ -228,7 +228,7 @@ form {"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} tree,graph - [] + [('type', '=', 'opportunity')] Opportunities Analysis menu gives you an instant access to your opportunities like expected revenue, planned cost, overpassed deadline or the number of exchanges by opportunity. diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml index 337b52954b3..3c4a988cc79 100644 --- a/addons/crm/test/test_crm_lead.yml +++ b/addons/crm/test/test_crm_lead.yml @@ -87,16 +87,16 @@ #- # | -# yaml is also not working smpt server and send new email. +# yaml is also not working with smtp server and send new email. - | I configure with smtp server. - | - And I communicate with lead through send New mail to Lead using it email address from user which are loged. + And I communicate with lead through send New mail to Lead using its email address from the user who is logged in. - | I check that communication history generated when send email to lead. - | - Then, I add a cc which receive copy of future communication between partner and users by mail. + Then, I add a cc which receive copy of future communication between partner and users by mail. - | I Reply to last Email to lead with some document attached.and check that communication history generated or not. diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml index 07a05caa09a..6dcf56cfe66 100644 --- a/addons/crm/test/test_crm_meeting.yml +++ b/addons/crm/test/test_crm_meeting.yml @@ -39,7 +39,7 @@ self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'alarm_id': ref("res_alarm_minituesbefore0")}) - | In order to check recurrence on meetings I will set Recurrency to Custom - and I set the fields so that the meeting will occure weekly on Monday and Friday 10 times + and I set the fields so that the meeting will occur weekly on Monday and Friday 10 times - !python {model: crm.meeting}: | self.write(cr, uid, [ref("crm_meeting_regardingpresentation0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1, 'count':10, 'interval': 1, 'freq': 'weekly', 'rrule_type': 'custom'}) @@ -59,14 +59,14 @@ assert len(ids) == 10 - | - Now If I want to edit meetings information for all occurence I click on "Edit All" button. + Now If I want to edit meetings information for all occurrence I click on "Edit All" button. - !python {model: crm.meeting}: | self.open_meeting(cr, uid, [ref('crm_meeting_regardingpresentation0')]) - | I can see that new meeting form is opened with same value I change some data for meeting and save it - I can see from meeting's calendar view that all meeting occurences are changed accordingly + I can see from meeting's calendar view that all meeting occurrences are changed accordingly - !record {model: crm.meeting, id: crm.crm_meeting_regardingpresentation0}: alarm_id: base_calendar.alarm9 diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml index cf62d05e0b6..e293c8f1797 100644 --- a/addons/crm/test/test_crm_opportunity.yml +++ b/addons/crm/test/test_crm_opportunity.yml @@ -32,7 +32,7 @@ - | I can see that Meeting's calendar view is shown. - then I click on the date on which I want schedule meeting. + then I click on the date on which I want to schedule meeting. I fill proper data for that meeting and save it - !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}: diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 2452132b64a..502dddcdcaa 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -19,7 +19,6 @@ # ############################################################################## -from mx.DateTime import now from osv import osv, fields from tools.translate import _ @@ -70,8 +69,6 @@ class crm_lead2opportunity(osv.osv_memory): id3 = data_obj.browse(cr, uid, id3, context=context).res_id lead = lead_obj.browse(cr, uid, record_id, context=context) - model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.lead')]) - for this in self.browse(cr, uid, ids, context=context): vals ={ @@ -144,7 +141,6 @@ Leads Could not convert into Opportunity")) @return : default values of fields. """ lead_obj = self.pool.get('crm.lead') - rec_ids = context and context.get('active_ids', []) data = context and context.get('active_ids', []) or [] res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context) for lead in lead_obj.browse(cr, uid, data, context=context): @@ -181,7 +177,6 @@ class crm_lead2opportunity_partner(osv.osv_memory): lead_obj = self.pool.get('crm.lead') partner_obj = self.pool.get('res.partner') contact_obj = self.pool.get('res.partner.address') - rec_ids = context and context.get('active_ids', []) partner_id = False data = context and context.get('active_ids', []) or [] @@ -219,7 +214,6 @@ class crm_lead2opportunity_partner(osv.osv_memory): partner_ids = self._create_partner(cr, uid, ids, context) mod_obj = self.pool.get('ir.model.data') result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter') - res = mod_obj.read(cr, uid, result, ['res_id']) value = {} data_obj = self.pool.get('ir.model.data') data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action') diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index aadd607c154..13dae7b35a1 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -131,8 +131,8 @@ class crm_send_new_email(osv.osv_memory): x_headers=x_headers ) - if not flag: - raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.')) +# if not flag: +# raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.')) msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'} case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \ diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index 0050642a5db..d815e645c10 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv, orm +from osv import fields, osv from crm import crm class crm_fundraising(crm.crm_case, osv.osv): diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py index 9ac6dc2fd84..0348665ffa0 100644 --- a/addons/document_email/__openerp__.py +++ b/addons/document_email/__openerp__.py @@ -28,7 +28,7 @@ "author" : "Tiny", "description": """Email Integrated Document * Email based Document submission - * user based document subission + * user based document submission """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py index 09c1ca6a66b..798ecba72c3 100644 --- a/addons/document_ftp/__openerp__.py +++ b/addons/document_ftp/__openerp__.py @@ -27,7 +27,7 @@ 'description': """This is a support FTP Interface with document management system. With this module you would not only be able to access documents through OpenERP but you would also be able to connect with them through the file system using the - a FTP client. + FTP client. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/document_ftp/test/document_ftp_test.yml b/addons/document_ftp/test/document_ftp_test.yml index f7c4abb0cdf..b3ff2a89250 100644 --- a/addons/document_ftp/test/document_ftp_test.yml +++ b/addons/document_ftp/test/document_ftp_test.yml @@ -1,7 +1,7 @@ - | - In order to test the document_ftp module in OpenERP, I will try different operation on the FTP interface, and check their impacts on OpenERP's documents and vice-versa. + In order to test the document_ftp module in OpenERP, I will try different operations on the FTP interface and check their impacts on OpenERP's documents and vice-versa. - - In order to test behaviour of resource Directory I will make one resource Directory "Labels" in OpenERP having type "Other Resources" and Directory mapped to object "Partner" + In order to test the behaviour of resource Directory, I will make one resource Directory "Labels" in OpenERP having type "Other Resources" and Directory mapped to object "Partner" - !record {model: 'document.directory', id: dir_label}: name : "Labels" @@ -25,20 +25,20 @@ storage_id : document.storage_default type : directory - - I am create a one Document name "Document" and select "File" as its Directory, + I am create one Document name "Document" and select "File" as its Directory, - - When I am creating the record then "Resource Title" is filled automatic with "Document". + When I am creating the record, "Resource Title" is filled automatic with "Document". - !record {model: 'ir.attachment', id: document_1}: name : "Document" parent_id : directory_file - - In order to connect FTP server and set "File" path. - I create one directory "New" in "File" directory from FTP and check its effect in OpenERP + In order to connect FTP server and set "File" path, + I create one directory "New" in "File" directory from FTP and check its effect in OpenERP. - Also Rename the directory name "New" to "New Directory". - - Remove directory "New Directory" and remove file "Document". + Remove directory "New Directory" and remove file "Document". - !python {model: ir.attachment}: | from ftplib import FTP @@ -64,10 +64,10 @@ In order to check directory created from FTP is working perfectly - Now I will test the same for Resource directory which is mapped with OpenERP object. - When you open this directory from FTP clients, it displays each records of mapped resource object as directory. + When you open this directory from FTP clients, it displays each record of mapped resource object as directory. - Now I test FTP client and Open the "Labels" Directory to check Resource Directory in FTP. - I can see that all Label of OpenERP are shown as children of "Labels" in FTP client as Directories + I can see that all Labels of OpenERP are shown as children of "Labels" in FTP client as Directories. - !python {model: ir.attachment}: | from ftplib import FTP diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml index 5a4df87fbe4..32434962ba2 100644 --- a/addons/document_ftp/test/document_ftp_test2.yml +++ b/addons/document_ftp/test/document_ftp_test2.yml @@ -48,7 +48,7 @@ ftp = te.get_ftp_folder(cr, uid, self, 'Documents') assert te.get_ftp_fulldata(ftp, "test.txt") == 'abcd' - - I append the string 'defgh' into "test.txt" + I append the string 'defgh' to "test.txt" - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml index 2161c1421da..dbdab370b97 100644 --- a/addons/document_ftp/test/document_ftp_test3.yml +++ b/addons/document_ftp/test/document_ftp_test3.yml @@ -5,10 +5,10 @@ from document_ftp import test_easyftp as te ftp = te.get_plain_ftp(timeout=1.0) - - I create in the server a folder called 'Äïêéìáóôéêüò ÖÜêåëëïò' + I create a folder called '������������ ��������' in the server. - !record {model: document.directory, id: dir_itests }: - name: 'Äïêéìáóôéêüò ÖÜêåëëïò' + name: '������������ ��������' parent_id: document.dir_root - And then I create another folder, under it, through FTP @@ -16,67 +16,67 @@ !python {model: ir.attachment}: | cr.commit() from document_ftp import test_easyftp as te - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò') - ftp.mkd("ÖÜêåëëïò áðü êÜôù") + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������') + ftp.mkd("�������� ��� ����") - I check that this folder exists at the server - - !assert {model: document.directory, id: , search: "[('name','=','ÖÜêåëëïò áðü êÜôù')]" }: + !assert {model: document.directory, id: , search: "[('name','=','�������� ��� ����')]" }: - parent_id != False - - I login with FTP and check that 'Äïêéìáóôéêüò ÖÜêåëëïò' is there + I login with FTP and check that '������������ ��������' is there - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù') + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����') - - I create a file named 'ÄïêéìÞ' into that folder + I create a file named '������' into that folder - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te from cStringIO import StringIO - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù') - fdata = StringIO('êåßìåíï ìå utf-8') - ftp.storbinary('STOR ÄïêéìÞ.txt', fdata) + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����') + fdata = StringIO('������� �� utf-8') + ftp.storbinary('STOR ������.txt', fdata) - - I remove the 'ÄïêéìÞ.txt' file + I remove the '������.txt' file - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te from cStringIO import StringIO - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù') - ftp.delete('ÄïêéìÞ.txt') + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����') + ftp.delete('������.txt') - - I rename 'ÖÜêåëëïò áðü êÜôù' into 'Üëëïò' + I rename '�������� ��� ����' into '�����' - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò') - ftp.rename("ÖÜêåëëïò áðü êÜôù", "Üëëïò") + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������') + ftp.rename("�������� ��� ����", "�����") - - I place a file 'file Ö3' in 'Üëëïò' + I place a file 'file �3' in '�����' - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te from cStringIO import StringIO - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò') - fdata = StringIO('êé Üëëï êåßìåíï') - ftp.storbinary('STOR file Ö3.txt', fdata) + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����') + fdata = StringIO('�� ���� �������') + ftp.storbinary('STOR file �3.txt', fdata) - I rename the file into file+range(1..200) (large filename) - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te from cStringIO import StringIO - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò') + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����') vuvuzela = 'b'+''.join('z' * 200)+'!' - ftp.rename("file Ö3.txt", vuvuzela) + ftp.rename("file �3.txt", vuvuzela) - I delete the file with the large name - !python {model: ir.attachment}: | from document_ftp import test_easyftp as te from cStringIO import StringIO - ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò') + ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����') vuvuzela = 'b'+''.join('z' * 200)+'!' ftp.delete(vuvuzela) diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py index 8d75578718d..c5526371065 100644 --- a/addons/document_ftp/test_easyftp.py +++ b/addons/document_ftp/test_easyftp.py @@ -25,20 +25,19 @@ """ from ftplib import FTP -from tools.misc import detect_ip_addr from tools import config def get_plain_ftp(timeout=10.0): ftp = FTP() host = config.get('ftp_server_host', '127.0.0.1') - port = config.get('ftp_server_port','8021') - ftp.connect(host,port, timeout=timeout) + port = config.get('ftp_server_port', '8021') + ftp.connect(host, port, timeout=timeout) return ftp def get_ftp_login(cr, uid, ormobj): ftp = get_plain_ftp() user = ormobj.pool.get('res.users').read(cr, uid, uid) - ftp.login(user.get('login',''),user.get('password','')) + ftp.login(user.get('login',''), user.get('password','')) ftp.cwd("/" + cr.dbname) return ftp diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml index 3440ef5d28d..da657640e93 100644 --- a/addons/event/test/test_event.yml +++ b/addons/event/test/test_event.yml @@ -15,7 +15,7 @@ !record {model: event.type, id: event_type_conference0}: name: Conferences - | - I'm creating one Event "Conference on OpenERP Business" which will be started beetween 1 and 10 in this month. + I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month. - !record {model: event.event, id: event_event_conference0}: date_begin: 2010-08-01 @@ -30,9 +30,9 @@ !assert {model: event.event, id: event_event_conference0}: - state == 'draft', "Event should be in draft by default when first time created" - | - Need Minimun 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations. + Need Minimum 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations. - | - So I set Minimun and Maximun Registrations limit. + So I set Minimum and Maximum Registrations limit. - !python {model: event.event}: | self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10}) @@ -49,7 +49,7 @@ - | "Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets. - | - I'm creating new partner "Mark Johnson" with him email "info@mycustomer.com". + I'm creating new partner "Mark Johnson" with his email "info@mycustomer.com". - !record {model: res.partner, id: res_partner_markjohnson0}: address: @@ -79,24 +79,24 @@ unit_price: 68.0 nb_register: 10 - | - I'm doing to Open that Registration. + I'm going to Open that Registration. - !python {model: event.registration}: | self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")]) - | - Check that Registration is in "Open" or not." + Check that Registration is in "Open" state or not. - !assert {model: event.registration, id: event_registration_registrationjacot0}: - state == 'open', "Registration should be open here." - | - I'm again try to confirm that conference event. + I'm again trying to confirm that conference event. - !python {model: event.event}: | self.button_confirm(cr, uid, [ref("event_event_conference0")]) - | - Now Minimun requirement of Registration is fullfil. so Check that Event is "confirmed" or not. + Now Minimum requirement of Registration is fulfil. so Check that Event is "confirmed" or not. - !assert {model: event.event, id: event_event_conference0}: - state == 'confirm', "Event should be confirmed here." @@ -133,18 +133,18 @@ nb_register: 100 - | - I'm doing to open "Mark Johnson" registration. + I'm going to open "Mark Johnson" registration. - !python {model: event.registration}: | self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")]) - | - But conference event do not allowed more than 100 Registrations. so Check that registration is not "open". + But conference event does not allow more than 100 Registrations. so Check that registration is not in "open" state. - !assert {model: event.registration, id: event_registration_registrationzen0}: - state == 'draft', "Registration should be in draft by default." - | - Now I'm modify number of tickets of "Mark Johnson"'s registration with 90 tickets. + Now I'm modifying number of tickets of "Mark Johnson"'s registration with 90 tickets. - !python {model: event.registration}: | self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90}) @@ -165,7 +165,7 @@ !python {model: event.event}: | self.button_done(cr, uid, [ref("event_event_conference0")]) - | - Check that conference "close" or not. + Check that conference is in "close" state or not. - !assert {model: event.event, id: event_event_conference0}: - state == 'done', "Registration should be Closed here." diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po index 326c97905d2..768fb87ff20 100644 --- a/addons/hr_holidays/i18n/ar.po +++ b/addons/hr_holidays/i18n/ar.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po index bde4f9b3220..985695ac614 100644 --- a/addons/hr_holidays/i18n/bg.po +++ b/addons/hr_holidays/i18n/bg.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po index 62177387a43..c5a747071a6 100644 --- a/addons/hr_holidays/i18n/bs.po +++ b/addons/hr_holidays/i18n/bs.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po index 381b8d71a35..0aff5904c8b 100644 --- a/addons/hr_holidays/i18n/ca.po +++ b/addons/hr_holidays/i18n/ca.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po index 40e2066a69f..734bf96cbbe 100644 --- a/addons/hr_holidays/i18n/cs.po +++ b/addons/hr_holidays/i18n/cs.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po index a25b9fcbb99..3408d87f8fc 100644 --- a/addons/hr_holidays/i18n/de.po +++ b/addons/hr_holidays/i18n/de.po @@ -31,11 +31,6 @@ msgstr "Alle Urlaubsanfragen" msgid "Invalid model name in the action definition." msgstr "Ungültiger Modellname in der Aktionsdefinition." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Verbleibende freie Tage" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "Abwesenheitstage Zusammenfassung" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Mitarbeiter Urlaub" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Setze auf Entwurf" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Meine Urlaubsanfragen" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Bemerkungen" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Urlaub Status" @@ -192,11 +182,6 @@ msgstr "Urlaub Status" msgid "Vacation end day" msgstr "Urlaubsende" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Urlaub erlaubt" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "Erfassung des Jahresurlaubs" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Mitabeiter" @@ -290,7 +274,6 @@ msgstr "Meine Urlaubsanträge" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Anzahl Tage" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Anzahl Tage in Urlaubsantrag" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -486,11 +468,6 @@ msgstr "Setze Jahresurlaub" msgid "My Draft Holidays Requests" msgstr "Meine Urlaubsanfragen (Entwurf)" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Maximale erlaubte Abwesenheiten" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -516,11 +493,6 @@ msgstr "Farbe des Status" msgid "Both Validated and Confirmed" msgstr "Bestätigt und Angenommen" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "bereits genommener Urlaub" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -531,11 +503,6 @@ msgstr "Urlaub." msgid "draft" msgstr "Entwurf" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Benutzer" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -562,7 +529,6 @@ msgid "Holiday manager" msgstr "Urlaubs Manager" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktiv" @@ -592,11 +558,6 @@ msgstr "Urlaubsanfragen (warten auf Genehmigung)" msgid "General" msgstr "Allgemein" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Allgemeine Informationen" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po index aa9aafc6611..23c367ffc69 100644 --- a/addons/hr_holidays/i18n/el.po +++ b/addons/hr_holidays/i18n/el.po @@ -34,11 +34,6 @@ msgstr "Όλες οι Αίτήσεις Αδείας" msgid "Invalid model name in the action definition." msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέÏγειας" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Άδειες που απομένουν" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -66,7 +61,6 @@ msgstr "Ρεπό Συνοπτικά" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Άδειες Υπαλλήλων" @@ -77,8 +71,6 @@ msgid "Set to Draft" msgstr "ΟÏισμός ως ΠÏόχειÏο" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -144,14 +136,12 @@ msgstr "Οι Αιτήσεις Αδείας μου" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Σημειώσεις" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Κατάσταση Αδειών" @@ -195,11 +185,6 @@ msgstr "ΤÏποι Αδειών" msgid "Vacation end day" msgstr "Τέλος άδειας" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "ΕπιτÏεπτές άδειες" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -257,7 +242,6 @@ msgstr "Κωδικοποίηση διαθέσιμων ετησίων αδειώ #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Υπάλληλος" @@ -293,7 +277,6 @@ msgstr "Οι Αιτήσεις μου" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "ΗμέÏες" @@ -347,7 +330,6 @@ msgid "Number of Days in this Holiday Request" msgstr "ΑÏιθμός ΗμεÏών στην Αίτηση" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -507,11 +489,6 @@ msgstr "ΟÏισμός Άδειας" msgid "My Draft Holidays Requests" msgstr "Αίτήσεις Αδείας μου (Ï€ÏόχειÏες)" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Ανώτατο ÏŒÏιο αδειών" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -537,11 +514,6 @@ msgstr "ΧÏώμα Κατάστασης" msgid "Both Validated and Confirmed" msgstr "Επιβεβαιωμένη και ΕπικυÏωμένη" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Άδειες ήδη χÏησιμοποιημένες" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -552,11 +524,6 @@ msgstr "holidays." msgid "draft" msgstr "Ï€ÏόχειÏη" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "ΧÏήστης" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -583,7 +550,6 @@ msgid "Holiday manager" msgstr "ΔιαχειÏιστής Αδειών" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "ΕνεÏγό" @@ -613,11 +579,6 @@ msgstr "Αιτήσεις Αδείας Ï€Ïος ΕπικÏÏωση" msgid "General" msgstr "Γενική" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Γενικές ΠληÏοφοÏίες" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po index e383d496fa4..34e32b241e0 100644 --- a/addons/hr_holidays/i18n/es.po +++ b/addons/hr_holidays/i18n/es.po @@ -32,11 +32,6 @@ msgstr "Todas las peticiones de vacaciones" msgid "Invalid model name in the action definition." msgstr "Nombre de modelo no válido en la definición de la acción" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Vacaciones disponibles" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "Resumen días de ausencia" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Vacaciones de empleado" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "Cambiar a borrador" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "Mis peticiones de vacaciones" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Notas" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Estado de vacaciones" @@ -193,11 +183,6 @@ msgstr "Estado de vacaciones" msgid "Vacation end day" msgstr "Fecha fin vacaciones" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Vacaciones permitidas" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "Codificación de vacaciones disponibles anuales." #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Empleado" @@ -291,7 +275,6 @@ msgstr "Mis peticiones" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Número de días" @@ -345,7 +328,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Número de días solicitados en esta petición" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -501,11 +483,6 @@ msgstr "Fijar vacaciones" msgid "My Draft Holidays Requests" msgstr "Mis peticiones en borrador" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Máximo de vacaciones permitidas" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -531,11 +508,6 @@ msgstr "Color del estado" msgid "Both Validated and Confirmed" msgstr "Validadas y Confirmadas" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Vacaciones realizadas" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -546,11 +518,6 @@ msgstr "Vacaciones." msgid "draft" msgstr "Borrador" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Usuario" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -577,7 +544,6 @@ msgid "Holiday manager" msgstr "Responsable de vacaciones" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Activo" @@ -607,11 +573,6 @@ msgstr "Peticiones esperando validación" msgid "General" msgstr "General" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Información general" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po index 8ca81b3fa80..796fba86a7d 100644 --- a/addons/hr_holidays/i18n/es_AR.po +++ b/addons/hr_holidays/i18n/es_AR.po @@ -32,11 +32,6 @@ msgstr "Todas las solicitudes de vacaciones" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Vacaciones restantes" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "Resumen de días de ausencia" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Vacaciones del empleado" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "Establecer como Borrador" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "Mis solicitudes de vacaciones" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Notas" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Estado de las vacaciones" @@ -193,11 +183,6 @@ msgstr "Estado de las Vacaciones" msgid "Vacation end day" msgstr "Fecha de Fin de las Vacaciones" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Vacaciones permitidas" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "Codificación de vacaciones disponibles por año." #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Empleado" @@ -291,7 +275,6 @@ msgstr "Mis solicitudes de vacaciones" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Cantidad de días" @@ -345,7 +328,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Número de días en esta solicitud de vacaciones" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -470,11 +452,6 @@ msgstr "Establecer vacaciones" msgid "My Draft Holidays Requests" msgstr "Mis solicitudes de vacaciones borrador" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Máximo de licencias permitidas" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -500,11 +477,6 @@ msgstr "Color del estado" msgid "Both Validated and Confirmed" msgstr "Ambas validadas y confirmadas" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Licencias ya tomadas" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -515,11 +487,6 @@ msgstr "vacaciones." msgid "draft" msgstr "borrador" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Usuario" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -546,7 +513,6 @@ msgid "Holiday manager" msgstr "Responsable de vacaciones" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Activo" @@ -576,11 +542,6 @@ msgstr "Peticiones esperando validación" msgid "General" msgstr "General" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Información General" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po index 36008fe3ae6..a1a6fd1d1f0 100644 --- a/addons/hr_holidays/i18n/es_EC.po +++ b/addons/hr_holidays/i18n/es_EC.po @@ -32,16 +32,6 @@ msgstr "Todas las peticiones de vacaciones" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Vacaciones disponibles" - -#. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting -msgid "Requests Awaiting for Validation" -msgstr "Peticiones esperando validación" - #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Blue" @@ -64,7 +54,6 @@ msgstr "Resumen días de ausencia" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Vacaciones empleado" @@ -75,8 +64,6 @@ msgid "Set to Draft" msgstr "Cambiar a borrador" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +129,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +178,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +235,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +270,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +322,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +446,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +471,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +481,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +507,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +536,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po index 59ae08e8ca2..7cf0660a40f 100644 --- a/addons/hr_holidays/i18n/et.po +++ b/addons/hr_holidays/i18n/et.po @@ -31,11 +31,6 @@ msgstr "Kõik puhkusetaotlus" msgid "Invalid model name in the action definition." msgstr "Vigane mudeli nimi toimingu definitsioonis." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Järelejäänud puhkusepäevi" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "Töövabade päevade kokkuvõte" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Töötaja Puhkused" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Sea mustandiks" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Minu puhkusetaotlused" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Märkmed" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Puhkuste staatus" @@ -192,11 +182,6 @@ msgstr "Puhkuste Staatus" msgid "Vacation end day" msgstr "Puhkuse lõpp" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Puhkused Lubatud" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "Igaastase saadaoleva puhkuse arvutamine" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Töötaja" @@ -290,7 +274,6 @@ msgstr "Minu puhkusetaotlused" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Päevade arv" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Päevade arv selles puhkusetaotluses" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "Sea Puhkus" msgid "My Draft Holidays Requests" msgstr "Minu puhkusetaotluste mustandid" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Maks. lubatud puhkusepäevi" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "Staatuse värv" msgid "Both Validated and Confirmed" msgstr "Valideeritud ja kinnitatud" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Juba võetud puhkusepäevad" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "puhkused." msgid "draft" msgstr "mustand" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Kasutaja" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "Puhkuste haldur" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktiivne" @@ -574,11 +540,6 @@ msgstr "Kinnitamist ootavad puhkusetaotlused" msgid "General" msgstr "Ãœldine" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Ãœldine info" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po index e23e4986105..a0c6aaf8d14 100644 --- a/addons/hr_holidays/i18n/fi.po +++ b/addons/hr_holidays/i18n/fi.po @@ -32,11 +32,6 @@ msgstr "Kaikki loma-anomukset" msgid "Invalid model name in the action definition." msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Jäljellä olevat lomat" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Työntekijän lomat" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "Aseta luonnokseksi" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "Omat loma-anomukset" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Huomautukset" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Loma status" @@ -193,11 +183,6 @@ msgstr "Lomien status" msgid "Vacation end day" msgstr "Loman päättymispäivä" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Lomat sallittuja" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "Käytettävissä olevien vuosilomien koodit" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Työntekijä" @@ -291,7 +275,6 @@ msgstr "Omat loma-anomukset" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Päivien lukumäärä" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Päivien määrä tässä loma-anomuksessa" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -499,11 +481,6 @@ msgstr "Aseta loma" msgid "My Draft Holidays Requests" msgstr "Omat loma-anomus luonnokset" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Sallittujen lomapäivien enimmäismäärä" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -529,11 +506,6 @@ msgstr "Statuksen väri" msgid "Both Validated and Confirmed" msgstr "Kummatkin - Tarkistetut ja Vahvistetut" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Lomapäivät on jo käytetty" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -544,11 +516,6 @@ msgstr "lomapäivät." msgid "draft" msgstr "luonnos" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Käyttäjä" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -575,7 +542,6 @@ msgid "Holiday manager" msgstr "Lomahallinta" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktiivinen" @@ -605,11 +571,6 @@ msgstr "Tarkistusta odottavat loma-anomukset" msgid "General" msgstr "Yleiset" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Yleiset Tiedot" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po index fd2ae13d539..e85e58a0956 100644 --- a/addons/hr_holidays/i18n/fr.po +++ b/addons/hr_holidays/i18n/fr.po @@ -31,11 +31,6 @@ msgstr "Toutes les Demandes de Vacances" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po index fc3e8431931..41fb35826a0 100644 --- a/addons/hr_holidays/i18n/hi.po +++ b/addons/hr_holidays/i18n/hi.po @@ -32,11 +32,6 @@ msgstr "सभी छà¥à¤Ÿà¥à¤Ÿà¥€ अनà¥à¤°à¥‹à¤§" msgid "Invalid model name in the action definition." msgstr "कारà¥à¤¯ की परिभाषा में मॉडल का नाम अमानà¥à¤¯ है." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "शेष छà¥à¤Ÿà¥à¤Ÿà¥€" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "Off-दिन 'सारांश" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "करà¥à¤®à¤šà¤¾à¤°à¥€ छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¤¾à¤" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "मेरी छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¥‹à¤‚ का अनà¥à¤°à¥‹à¤§" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "टिपà¥à¤ªà¤£à¥€" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¥‹à¤‚ की सà¥à¤¥à¤¿à¤¤à¤¿" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "छà¥à¤Ÿà¥à¤Ÿà¥€ का अंतिम दिन" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "वारà¥à¤·à¤¿à¤• उपलबà¥à¤§ छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¥‹à¤‚ क #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "करà¥à¤®à¤šà¤¾à¤°à¥€" @@ -291,7 +275,6 @@ msgstr "मेरी छà¥à¤Ÿà¥à¤Ÿà¥€ का अनà¥à¤°à¥‹à¤§" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "दिनों की संखà¥à¤¯à¤¾" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "इस छà¥à¤Ÿà¥à¤Ÿà¥€ के अनà¥à¤°à¥‹à¤§ के दिनों की संखà¥à¤¯à¤¾" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -472,11 +454,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "अधिकतम छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¤¾à¤‚ की अनà¥à¤®à¤¤à¤¿" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -502,11 +479,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "पहले से ही ली हà¥à¤ˆ छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¥‹à¤‚" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -517,11 +489,6 @@ msgstr "छà¥à¤Ÿà¥à¤Ÿà¤¿à¤¯à¤¾à¤‚" msgid "draft" msgstr "डà¥à¤°à¤¾à¥žà¥à¤Ÿ" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "उपयोगकरà¥à¤¤à¤¾" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -548,7 +515,6 @@ msgid "Holiday manager" msgstr "छà¥à¤Ÿà¥à¤Ÿà¥€ पà¥à¤°à¤¬à¤‚धक" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "सकà¥à¤°à¤¿à¤¯" @@ -578,11 +544,6 @@ msgstr "" msgid "General" msgstr "सामानà¥à¤¯" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "सामानà¥à¤¯ जानकारी" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po index c3615ec4226..086189391ae 100644 --- a/addons/hr_holidays/i18n/hr.po +++ b/addons/hr_holidays/i18n/hr.po @@ -31,11 +31,6 @@ msgstr "Svi zahtjevi za GO" msgid "Invalid model name in the action definition." msgstr "PogreÅ¡no ime modela u definiciji akcije." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "NeiskoriÅ¡teni GO" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "GO Djelatnika" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Postavi na neodobreno" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Moji zahtjevi za GO" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "BiljeÅ¡ke" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Status GO" @@ -192,11 +182,6 @@ msgstr "Status GO" msgid "Vacation end day" msgstr "Zadnji dan dopusta" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "DopuÅ¡teni GO" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Djelatnik" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 582eb12d157..9de4bff1b16 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -30,11 +30,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -62,7 +57,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -73,8 +67,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -140,14 +132,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -191,11 +181,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -253,7 +238,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -289,7 +273,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -342,7 +325,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -453,11 +435,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -483,11 +460,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -498,11 +470,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -529,7 +496,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -559,11 +525,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po index 8e9d8d4508b..3b97235876e 100644 --- a/addons/hr_holidays/i18n/hu.po +++ b/addons/hr_holidays/i18n/hu.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po index 9d72df1bcb1..0c271b14c5a 100644 --- a/addons/hr_holidays/i18n/id.po +++ b/addons/hr_holidays/i18n/id.po @@ -31,11 +31,6 @@ msgstr "Semua Permintaan Hari Libur" msgid "Invalid model name in the action definition." msgstr "Nama model tidak sah di definsi aksi" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Hari Libur Karyawan" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Permintaan Hari Libur Saya" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Catatan" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Status Hari Libur" @@ -192,11 +182,6 @@ msgstr "Status Hari Libur" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Hari Libur Diizinkan" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Karyawan" @@ -290,7 +274,6 @@ msgstr "Permintaan Hari Libur Saya" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Jumlah Hari" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "Warna dari status" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "hari libur." msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Pengguna" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktif" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "Umum" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Informasi Umum" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po index f11d29d5dde..b333ceacf59 100644 --- a/addons/hr_holidays/i18n/it.po +++ b/addons/hr_holidays/i18n/it.po @@ -31,11 +31,6 @@ msgstr "Tutte le richieste di ferie" msgid "Invalid model name in the action definition." msgstr "Nome modello non valido nella definizione dell'azione." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Permessi rimanenti" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "Riepilogo giorni di assenza" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Ferie del dipentente" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Imposta come Bozza" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Le Mie Richieste di Ferie" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Annotazioni" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Stato delle Ferie" @@ -192,11 +182,6 @@ msgstr "Stato delle Ferie" msgid "Vacation end day" msgstr "Ultimo giorno di Ferie" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Ferie Accordate" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "Codificazione delle ferie annuali disponibili" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Dipendente/Impiegato" @@ -290,7 +274,6 @@ msgstr "Le mie richieste di ferie" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Numero Giorni" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Numero Giorni in questa Richiesta di Ferie" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -502,11 +484,6 @@ msgstr "Definisci le Ferie" msgid "My Draft Holidays Requests" msgstr "Le mie bozze di richiesta ferie" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Numero Massimo di permessi" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -532,11 +509,6 @@ msgstr "Colore dello Stato" msgid "Both Validated and Confirmed" msgstr "Entrambe validate e confermate" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Permessi già fruiti" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -547,11 +519,6 @@ msgstr "ferie." msgid "draft" msgstr "Bozza" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Utente" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -578,7 +545,6 @@ msgid "Holiday manager" msgstr "Responsabile Ferie" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Attivo" @@ -608,11 +574,6 @@ msgstr "Richieste di Ferie in attesa di convalida" msgid "General" msgstr "Generale" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Informazione Generale" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po index 7f41a474c60..0071ce5bcd3 100644 --- a/addons/hr_holidays/i18n/ko.po +++ b/addons/hr_holidays/i18n/ko.po @@ -32,11 +32,6 @@ msgstr "새 íœ´ì¼ ìš”ì²­" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "ë‚¨ì€ íœ´ê°€ ì¼ìˆ˜" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "휴무 요약" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "ì§ì› 휴가" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "초안으로 설정" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "ë‚´ íœ´ì¼ ìš”ì²­" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "노트" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "íœ´ì¼ ìƒíƒœ" @@ -193,11 +183,6 @@ msgstr "휴무 ìƒíƒœ" msgid "Vacation end day" msgstr "휴가 마지막 ë‚ " -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "í—ˆìš©ëœ íœ´ë¬´" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "ì—°ê°„ 가용 íœ´ì¼ ìˆ˜ì˜ ì¸ì½”딩" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "ì§ì›" @@ -291,7 +275,6 @@ msgstr "ë‚´ íœ´ì¼ ìš”ì²­ë“¤" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "ì¼ ìˆ˜" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "ì´ íœ´ì¼ ìš”ì²­ì— í¬í•¨ëœ ì¼ ìˆ˜" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "휴ì¼ë¡œ 설정" msgid "My Draft Holidays Requests" msgstr "ë‚´ íœ´ì¼ ìš”ì²­ 초안들" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "í—ˆìš©ëœ ìµœëŒ€ 휴무" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "ìƒíƒœ 색깔" msgid "Both Validated and Confirmed" msgstr "ê²€ì¦ë˜ê³  확정ë¨" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "ì´ë¯¸ 사용한 휴무" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "휴ì¼" msgid "draft" msgstr "초안" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "사용ìž" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "íœ´ì¼ ê´€ë¦¬ìž" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "활성" @@ -575,11 +541,6 @@ msgstr "ê²€ì¦ ëŒ€ê¸° ì¤‘ì¸ íœ´ë¬´ 요청" msgid "General" msgstr "ì¼ë°˜" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "ì¼ë°˜ ì •ë³´" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po index 32c6a23db65..ce91bc006c1 100644 --- a/addons/hr_holidays/i18n/lt.po +++ b/addons/hr_holidays/i18n/lt.po @@ -31,11 +31,6 @@ msgstr "Visi atostogų praÅ¡ymai" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "NeiÅ¡naudotos atostogos" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Darbuotojo atostogos" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Nustatyti kaip juodraÅ¡tį" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Mano atostogų praÅ¡ymai" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "UžraÅ¡ai" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Atostogų bÅ«sena" @@ -192,11 +182,6 @@ msgstr "Atostogų bÅ«sena" msgid "Vacation end day" msgstr "Atostogų paskutinÄ— diena" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Atostogauti leidžiama" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Darbuotojas" @@ -290,7 +274,6 @@ msgstr "Mano atostogų praÅ¡ymai" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Dienų skaiÄius" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Dienų skaiÄius Å¡iame atostogų praÅ¡yme" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "Nustatyti atostogas" msgid "My Draft Holidays Requests" msgstr "Mano atostogų praÅ¡ymų juodraÅ¡Äiai" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "BÅ«senos spalva" msgid "Both Validated and Confirmed" msgstr "Validuotos ir patvirtintos" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "IÅ¡naudotos dienos" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "atostogos." msgid "draft" msgstr "juodraÅ¡tis" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Naudotojas" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "Atostogų praÅ¡ymai laukiantys patvirtinimo" msgid "General" msgstr "Pagrindinis" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "PagrindinÄ— informacija" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po index d09297af343..b81d1c4f25a 100644 --- a/addons/hr_holidays/i18n/lv.po +++ b/addons/hr_holidays/i18n/lv.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po index 2522cd66c4c..53f4a2b47bc 100644 --- a/addons/hr_holidays/i18n/mn.po +++ b/addons/hr_holidays/i18n/mn.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po index d3dcf1df0b3..cc33e6a4c30 100644 --- a/addons/hr_holidays/i18n/nl.po +++ b/addons/hr_holidays/i18n/nl.po @@ -31,11 +31,6 @@ msgstr "Alle verlofaanvragen" msgid "Invalid model name in the action definition." msgstr "Ongeldige modelnaam in de actie-definitie." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Resterend verlof" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "Samenvatting vrije dagen" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Verlof werknemer" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Zet op concept" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Mijn verlofaanvragen" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Opmerkingen" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Verlofstatus" @@ -192,11 +182,6 @@ msgstr "Verlofstati" msgid "Vacation end day" msgstr "Einddatum verlof" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Verlof toegestaan" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "Vastleggen van jaarlijks beschikbare verlofdagen" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Werknemer" @@ -290,7 +274,6 @@ msgstr "Mijn verlofaanvragen" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Aantal dagen" @@ -346,7 +329,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Aantal dagen in deze verlofaanvraag" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -501,11 +483,6 @@ msgstr "Stel verlof in" msgid "My Draft Holidays Requests" msgstr "Mijn concept verlofaanvragen" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Maximaal toegestane verlofdagen" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -531,11 +508,6 @@ msgstr "Statuskleur" msgid "Both Validated and Confirmed" msgstr "Zowel gevalideerd als bevestigd" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Eerder opgenomen verlof" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -546,11 +518,6 @@ msgstr "verlof." msgid "draft" msgstr "concept" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Gebruiker" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -577,7 +544,6 @@ msgid "Holiday manager" msgstr "Verlofbeheerder" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Actief" @@ -607,11 +573,6 @@ msgstr "Verlofaanvragen wachtend op bevestiging" msgid "General" msgstr "Algemeen" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Algemene informatie" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po index aea5f98a4d9..b755d931cd0 100644 --- a/addons/hr_holidays/i18n/nl_BE.po +++ b/addons/hr_holidays/i18n/nl_BE.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po index 6d4e2ef6956..25eac8a68a6 100644 --- a/addons/hr_holidays/i18n/pl.po +++ b/addons/hr_holidays/i18n/pl.po @@ -31,11 +31,6 @@ msgstr "Wszystkie wnioski urlopowe" msgid "Invalid model name in the action definition." msgstr "NieprawidÅ‚owa nazwa modelu w definicji akcji." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "PozostaÅ‚o dni urlopu" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "Suma dni wolnych" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Urlopy pracownika" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Ustaw na projekt" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Moje wnioski urlopowe" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Uwagi" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Rodzaj urlopu" @@ -192,11 +182,6 @@ msgstr "Rodzaje urlopu" msgid "Vacation end day" msgstr "Ostatni dzieÅ„ urlopu" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Dozwolone urlopy" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "Wprowadzanie urlopów przysÅ‚ugujÄ…cych w roku" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Pracownik" @@ -290,7 +274,6 @@ msgstr "Moje wnioski urlopowe" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Liczba dni" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Liczba wnioskowanych dni urlopu" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "Ustaw urlop" msgid "My Draft Holidays Requests" msgstr "Moje wnioski urlopowe - projekty" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Maksymalna liczba dni urlopowych" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "Kolor dla rodzaju" msgid "Both Validated and Confirmed" msgstr "Zarówno potwierdzone jak i zatwierdzone" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Wykorzystane nieobecnoÅ›ci" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "urlopy." msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Użytkownik" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "Menedżer urlopów" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktywny" @@ -574,11 +540,6 @@ msgstr "Wnioski urlopowe - czekajÄ…ce na zatwierdzenie" msgid "General" msgstr "Ogólne" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Informacje ogólne" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po index 3e053943408..f9377994e61 100644 --- a/addons/hr_holidays/i18n/pt.po +++ b/addons/hr_holidays/i18n/pt.po @@ -31,11 +31,6 @@ msgstr "Todos os pedidos de férias" msgid "Invalid model name in the action definition." msgstr "Nome de modelo inválido na definição da acção" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "Resumo dos dias de folga" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Ferias dos empregados" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Definir como esboço" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Meus pedidos de férias" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Notas" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Estado das férias" @@ -192,11 +182,6 @@ msgstr "Estado das férias" msgid "Vacation end day" msgstr "Data de término das férias" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Férias permitidas" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "Codificação de feriados anuais disponíveis." #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Empregado" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Numero de dias" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Número de dias neste pedido de férias" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "Definir feria" msgid "My Draft Holidays Requests" msgstr "Meus esboços de pedidos de férias" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "Máximo de saídas permitidas" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "Cor do estado" msgid "Both Validated and Confirmed" msgstr "Ambos validados e confirmados" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "Saídas tomadas" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "holidays." msgid "draft" msgstr "esboço" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Utilizador" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "Gestor de férias" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Activo" @@ -574,11 +540,6 @@ msgstr "Pedidos de férias aguardando validação" msgid "General" msgstr "Geral" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Informação Generica" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po index 5c3308e8edb..3b33111bc3b 100644 --- a/addons/hr_holidays/i18n/pt_BR.po +++ b/addons/hr_holidays/i18n/pt_BR.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po index 1126c510e93..6131146bd25 100644 --- a/addons/hr_holidays/i18n/ro.po +++ b/addons/hr_holidays/i18n/ro.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po index 868763e8882..1ef3a978ad7 100644 --- a/addons/hr_holidays/i18n/ru.po +++ b/addons/hr_holidays/i18n/ru.po @@ -32,11 +32,6 @@ msgstr "Ð’Ñе заÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½Ð° отпуÑк" msgid "Invalid model name in the action definition." msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ в определении дейÑтвиÑ." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "ОÑтавшиеÑÑ Ð¾Ñ‚Ð¿ÑƒÑка" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "ОтпуÑка Ñотрудника" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "Мои заÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½Ð° отпуÑк" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "ПримечаниÑ" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¾Ñ‚Ð¿ÑƒÑка" @@ -193,11 +183,6 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¾Ñ‚Ð¿ÑƒÑков" msgid "Vacation end day" msgstr "ПоÑледний день отпуÑка" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Разрешено отпуÑков" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Сотрудник" @@ -291,7 +275,6 @@ msgstr "Мои запроÑÑ‹ отпуÑков" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Кол-во дней" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "КоличеÑтво дней в данном заÑвлении на отпуÑк" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "УÑтановить отпуÑк" msgid "My Draft Holidays Requests" msgstr "Мои черновые заÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½Ð° отпуÑк" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "МакÑимально позволенные отпуÑка" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "Цвет ÑтатуÑа" msgid "Both Validated and Confirmed" msgstr "Оба Утвержденные и Подтвержденные" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "ОтпуÑка, уже взÑтые" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "отпуÑков." msgid "draft" msgstr "черновик" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Пользователь" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "ОтветÑтвенный за график отпуÑков" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Ðктивно" @@ -575,11 +541,6 @@ msgstr "ЗаÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½Ð° отпуÑк в ожидании проверк msgid "General" msgstr "Общие" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po index fc597a4370c..cdebceb33aa 100644 --- a/addons/hr_holidays/i18n/sl.po +++ b/addons/hr_holidays/i18n/sl.po @@ -31,11 +31,6 @@ msgstr "Vsi zahtevki za praznike" msgid "Invalid model name in the action definition." msgstr "NapaÄno ime modela v definiciji dejanja." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Preostali odhodi" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Preklopi v pripravo" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Opombe" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Zaposlenec" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Å tevilo dni" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "Barva stanja" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "osnutek" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Uporabnik" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktivno" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "SploÅ¡no" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "SploÅ¡ne informacije" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po index 2270182ecc6..86bbe55e8ef 100644 --- a/addons/hr_holidays/i18n/sq.po +++ b/addons/hr_holidays/i18n/sq.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po index b3d55ec8dcc..423b3694476 100644 --- a/addons/hr_holidays/i18n/sr.po +++ b/addons/hr_holidays/i18n/sr.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po index c1ff3d19231..b6ec2b68b07 100644 --- a/addons/hr_holidays/i18n/sv.po +++ b/addons/hr_holidays/i18n/sv.po @@ -31,11 +31,6 @@ msgstr "Alla semeseransökningar" msgid "Invalid model name in the action definition." msgstr "Ogiltigt modellnamn i Ã¥tgärdsdefinitionen." -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "Ã…terstÃ¥ende semestrar" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Den anställdes semestrar" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Sätt till preliminär" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Mina semesteransökningar" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Anteckningar" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Semesterstatus" @@ -192,11 +182,6 @@ msgstr "Semesterstatus" msgid "Vacation end day" msgstr "Semesterns slutdatum" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "Semestern är godkänd" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Anställd" @@ -290,7 +274,6 @@ msgstr "Mina semesteransökningar" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Antal dagar" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "Antal dagar för denna semesteransökan" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "Definiera semester" msgid "My Draft Holidays Requests" msgstr "Mina preliminära semesteransökningar" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "Statusfärg" msgid "Both Validated and Confirmed" msgstr "BÃ¥de beslutad och godkönd" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "semestrar." msgid "draft" msgstr "preliminär" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Användare" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "Semesteransvarig" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktiv" @@ -574,11 +540,6 @@ msgstr "Semesteransökningar som väntar pÃ¥ beslut" msgid "General" msgstr "Allmän" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Allmän information" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po index fb5b7545717..212bcb09914 100644 --- a/addons/hr_holidays/i18n/th.po +++ b/addons/hr_holidays/i18n/th.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po index a5d708a5204..546b120215d 100644 --- a/addons/hr_holidays/i18n/tlh.po +++ b/addons/hr_holidays/i18n/tlh.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po index b2a66db3545..512cb3384c2 100644 --- a/addons/hr_holidays/i18n/tr.po +++ b/addons/hr_holidays/i18n/tr.po @@ -31,11 +31,6 @@ msgstr "Tüm Ä°zin Talepleri" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "Personel Ä°zinleri" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "Taslak olarak Ayarla" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "Ä°zin Taleplerim" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "Notlar" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "Ä°zin Durumu" @@ -192,11 +182,6 @@ msgstr "Ä°zin Durumu" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "Personel" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "Gün Sayısı" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "Taslak olan Ä°zin Taleplerim" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "Her ikisi doÄŸrulandı ve onaylandı" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "Taslak" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "Kullanıcı" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "Aktif" @@ -574,11 +540,6 @@ msgstr "Onay Bekleyen Ä°zin Talepleri" msgid "General" msgstr "Genel" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "Genel Bilgiler" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po index ef9720ff956..9bf19017b0f 100644 --- a/addons/hr_holidays/i18n/uk.po +++ b/addons/hr_holidays/i18n/uk.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po index 0132896348e..b8d2d6021be 100644 --- a/addons/hr_holidays/i18n/vi.po +++ b/addons/hr_holidays/i18n/vi.po @@ -32,11 +32,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -64,7 +59,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -75,8 +69,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -142,14 +134,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -193,11 +183,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -255,7 +240,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -291,7 +275,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -344,7 +327,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -469,11 +451,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -499,11 +476,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -514,11 +486,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -545,7 +512,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -575,11 +541,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po index b4260c9fa4a..c18cd448b57 100644 --- a/addons/hr_holidays/i18n/zh_CN.po +++ b/addons/hr_holidays/i18n/zh_CN.po @@ -31,11 +31,6 @@ msgstr "所有å‡æœŸç”³è¯·" msgid "Invalid model name in the action definition." msgstr "在动作定义中使用了无效的模快å。" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "剩余休å‡" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "休æ¯æ—¥æ‘˜è¦" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "员工å‡æœŸ" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "设为è‰ç¨¿" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "我的å‡æœŸç”³è¯·" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "备注" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "å‡æœŸçŠ¶æ€" @@ -192,11 +182,6 @@ msgstr "å‡æœŸçŠ¶æ€" msgid "Vacation end day" msgstr "å‡æœŸç»“æŸæ—¥æœŸ" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "å‡æœŸå·²æ‰¹å‡†" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "æ¯å¹´å¯å¾—到的å‡æœŸç¼–ç " #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "员工" @@ -290,7 +274,6 @@ msgstr "我的å‡æœŸç”³è¯·è‰ç¨¿" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "天数" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "申请的å‡æœŸå¤©æ•°" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -479,11 +461,6 @@ msgstr "设定å‡æœŸ" msgid "My Draft Holidays Requests" msgstr "我的å‡æœŸç”³è¯·è‰ç¨¿" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "最大休å‡å…许" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -509,11 +486,6 @@ msgstr "状æ€é¢œè‰²" msgid "Both Validated and Confirmed" msgstr "批准和确认" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "休å‡å·²å¾—到" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -524,11 +496,6 @@ msgstr "å‡æœŸ" msgid "draft" msgstr "è‰ç¨¿" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "用户" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -555,7 +522,6 @@ msgid "Holiday manager" msgstr "å‡æœŸç®¡ç†" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "有效" @@ -585,11 +551,6 @@ msgstr "å‡æœŸç”³è¯·ç­‰å¾…批准" msgid "General" msgstr "通用" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "一般信æ¯" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po index ee86653aff4..80b8ef4b38d 100644 --- a/addons/hr_holidays/i18n/zh_TW.po +++ b/addons/hr_holidays/i18n/zh_TW.po @@ -31,11 +31,6 @@ msgstr "" msgid "Invalid model name in the action definition." msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,remaining_leaves:0 -msgid "Remaining Leaves" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" @@ -63,7 +58,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" msgstr "" @@ -74,8 +68,6 @@ msgid "Set to Draft" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 -#: field:hr.holidays.per.user,holiday_ids:0 #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" @@ -141,14 +133,12 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,notes:0 -#: field:hr.holidays.per.user,notes:0 msgid "Notes" msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 -#: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" msgstr "" @@ -192,11 +182,6 @@ msgstr "" msgid "Vacation end day" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "Holidays Allowed" -msgstr "" - #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 msgid "Legal Declaration Document to declare new employee" @@ -254,7 +239,6 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 -#: field:hr.holidays.per.user,employee_id:0 msgid "Employee" msgstr "" @@ -290,7 +274,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: view:hr.holidays.per.user:0 msgid "Number of Days" msgstr "" @@ -343,7 +326,6 @@ msgid "Number of Days in this Holiday Request" msgstr "" #. module: hr_holidays -#: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" @@ -468,11 +450,6 @@ msgstr "" msgid "My Draft Holidays Requests" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,max_leaves:0 -msgid "Maximum Leaves Allowed" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" @@ -498,11 +475,6 @@ msgstr "" msgid "Both Validated and Confirmed" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,leaves_taken:0 -msgid "Leaves Already Taken" -msgstr "" - #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." @@ -513,11 +485,6 @@ msgstr "" msgid "draft" msgstr "" -#. module: hr_holidays -#: field:hr.holidays.per.user,user_id:0 -msgid "User" -msgstr "" - #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" @@ -544,7 +511,6 @@ msgid "Holiday manager" msgstr "" #. module: hr_holidays -#: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" msgstr "" @@ -574,11 +540,6 @@ msgstr "" msgid "General" msgstr "" -#. module: hr_holidays -#: view:hr.holidays.per.user:0 -msgid "General Information" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 6454f169fc0..c7435127466 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py index 8ec13ede5f5..28b96f7aebe 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py @@ -24,7 +24,7 @@ from report import report_sxw class all_closed_cashbox_of_the_day(report_sxw.rml_parse): - + #TOFIX: sql injection problem: SQL Request must be pass from sql injection... def __init__(self, cr, uid, name, context): super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context) self.localcontext.update({ @@ -91,13 +91,13 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse): return False def _get_partner(self,statement): res = {} - sql =""" select rp.name from account_bank_statement_line as absl,res_partner as rp - where absl.partner_id = rp.id - and absl.pos_statement_id = %d"""%(statement['pos_statement_id']) - self.cr.execute(sql) - res = self.cr.dictfetchall() - if res : - return res[0]['name'] + if statement['pos_statement_id']: + sql =""" select rp.name from account_bank_statement_line as absl,res_partner as rp + where absl.partner_id = rp.id + and absl.pos_statement_id = %d"""%(statement['pos_statement_id']) + self.cr.execute(sql) + res = self.cr.dictfetchall() or {} + return res and res[0]['name'] else : return 0.00 diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index 28f240c1070..fd3bbf9c43c 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -73,6 +73,7 @@ + @@ -183,10 +184,10 @@ [[taxes(l)]] - [[ formatLang(l.qty) ]] + [[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]] - [[ formatLang(l.price_unit) ]][[o.pricelist_id.currency_id. symbol ]] + [[ formatLang(l.price_unit) ]] [[ formatLang(l.discount) ]] @@ -220,7 +221,7 @@ - Net Total + Net Total : [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]] @@ -248,7 +249,7 @@ - Taxes + Taxes : [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]] @@ -276,7 +277,7 @@ - Total + Total : [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]] @@ -287,4 +288,4 @@ - \ No newline at end of file + diff --git a/addons/project/project.py b/addons/project/project.py index 274263682a6..da3fef05f66 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -28,7 +28,6 @@ from itertools import groupby from tools.misc import flatten from tools.translate import _ from osv import fields, osv -from tools import email_send as email class project_task_type(osv.osv): @@ -245,7 +244,6 @@ class project(osv.osv): if context is None: context = {} - task_obj = self.pool.get('project.task') proj = self.browse(cr, uid, id, context=context) default = default or {} context['active_test'] = False @@ -261,7 +259,6 @@ class project(osv.osv): context = {} project_obj = self.pool.get('project.project') data_obj = self.pool.get('ir.model.data') - task_obj = self.pool.get('project.task') result = [] for proj in self.browse(cr, uid, ids, context=context): parent_id = context.get('parent_id', False) @@ -279,8 +276,7 @@ class project(osv.osv): 'date':new_date_end, 'parent_id':parent_id}, context=context) result.append(new_id) - cr.execute('select id from project_task where project_id=%s', (proj.id,)) - res = cr.fetchall() + child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)], context=context) parent_id = self.read(cr, uid, new_id, ['analytic_account_id'])['analytic_account_id'][0] if child_ids: @@ -320,7 +316,7 @@ class project(osv.osv): if child_ids: self.setActive(cr, uid, child_ids, value, context=None) return True - + project() class users(osv.osv): diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f8fe814e218..e1b64ccbf1b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -59,7 +59,13 @@ - + + + + + + + diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py index 78ffa5a8338..7091f466e2c 100644 --- a/addons/project/wizard/project_task_close.py +++ b/addons/project/wizard/project_task_close.py @@ -19,11 +19,9 @@ # ############################################################################## -import time - from osv import fields, osv +import tools from tools.translate import _ -from tools import email_send as email class project_task_close(osv.osv_memory): """ @@ -47,7 +45,6 @@ class project_task_close(osv.osv_memory): context = {} record_id = context and context.get('active_id', False) or False task_pool = self.pool.get('project.task') - project_pool = self.pool.get('project.project') res = super(project_task_close, self).default_get(cr, uid, fields, context=context) task = task_pool.browse(cr, uid, record_id, context=context) @@ -77,41 +74,41 @@ class project_task_close(osv.osv_memory): return {} task = task_pool.browse(cr, uid, task_id, context=context) for data in self.browse(cr, uid, ids, context=context): - if res: - # Send Warn Message by Email to Manager and Customer - if data.manager_warn and not data.manager_email: - raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager.")) + # Send Warn Message by Email to Manager and Customer + if data.manager_warn and not data.manager_email: + raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager.")) - elif data.partner_warn and not data.partner_email: - raise osv.except_osv(_('Error'), _("Please specify the email address of Customer.")) + elif data.partner_warn and not data.partner_email: + raise osv.except_osv(_('Error'), _("Please specify the email address of Customer.")) - elif data.manager_warn or data.partner_warn: - project = task.project_id - subject = _("Task '%s' Closed") % task.name - if task.user_id and task.user_id.address_id and task.user_id.address_id.email: - from_adr = task.user_id.address_id.email - signature = task.user_id.signature - else: - raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!")) - val = { - 'name': task.name, - 'user_id': task.user_id.name, - 'task_id': "%d/%d" % (project.id, task.id), - 'date_start': task.date_start, - 'date_end': task.date_end, - 'state': task.state - } + elif data.manager_warn or data.partner_warn: + project = task.project_id + subject = _("Task '%s' Closed") % task.name + if task.user_id and task.user_id.address_id and task.user_id.address_id.email: + from_adr = task.user_id.address_id.email + signature = task.user_id.signature + else: + raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!")) + val = { + 'name': task.name, + 'user_id': task.user_id.name, + 'task_id': "%d/%d" % (project.id, task.id), + 'date_start': task.date_start, + 'date_end': task.date_end, + 'state': task.state + } - header = (project.warn_header or '') % val - footer = (project.warn_footer or '') % val - body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature) - if data.manager_warn and data.manager_email: - to_adr.append(data.manager_email) - if data.partner_warn and data.partner_email: - to_adr.append(data.partner_email) - mail_id = email(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr]) - if not mail_id: - raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings")) + to_adr = [] + header = (project.warn_header or '') % val + footer = (project.warn_footer or '') % val + body = u'%s\n%s\n%s\n\n-- \n%s' % (header, task.description, footer, signature) + if data.manager_warn and data.manager_email: + to_adr.append(data.manager_email) + if data.partner_warn and data.partner_email: + to_adr.append(data.partner_email) + mail_id = tools.email_send(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr]) + if not mail_id: + raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings")) return {} project_task_close() diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index 2430b8a0896..ac160fb6c94 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -48,9 +48,6 @@ class project_task_delegate(osv.osv_memory): record_id = context and context.get('active_id', False) or False task_pool = self.pool.get('project.task') task = task_pool.browse(cr, uid, record_id, context=context) - project = task.project_id - manager = project.user_id or False - partner = task.partner_id or task.project_id.partner_id if 'name' in fields: if task.name.startswith(_('CHECK: ')): diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py index f29780126e0..47c7c02cba8 100644 --- a/addons/project_gtd/project_gtd.py +++ b/addons/project_gtd/project_gtd.py @@ -22,16 +22,9 @@ import sys from osv import fields, osv -import ir import tools from tools.translate import _ -try: - from lxml import etree -except ImportError: - sys.stderr.write("ERROR: Import lxml module\n") - sys.stderr.write("ERROR: Try to install the python-lxml package\n") - class project_gtd_context(osv.osv): _name = "project.gtd.context" _description = "Context" diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 05e047914b7..19db547983b 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -19,21 +19,15 @@ # ############################################################################## -import base64 -import os -import re -import time -from datetime import datetime, timedelta -import binascii -import collections - -import tools from crm import crm -from osv import fields,osv,orm -from osv.orm import except_orm +from datetime import datetime +from osv import fields,osv from tools.translate import _ +import binascii +import time import tools + class project_issue(crm.crm_case, osv.osv): _name = "project.issue" _description = "Project Issue" diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 41ebaa3243e..97a340851ef 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -44,7 +44,6 @@ class project_issue_report(osv.osv): @param context: A standard dictionary for contextual values """ res = {} - avg_ans = 0.0 for report in self.browse(cr, uid, ids, context): res[report.id]= { diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 79837416d97..a535015d067 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -19,8 +19,7 @@ # ############################################################################## -import time -from datetime import date, datetime, timedelta +from datetime import datetime from tools.translate import _ from osv import fields, osv from resource.faces import task as Task diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index c43dea56e91..ade1da5c9d9 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -import datetime from tools.translate import _ from osv import fields, osv @@ -38,7 +37,6 @@ class project_compute_phases(osv.osv_memory): } def check_selection(self, cr, uid, ids, context=None): - data_select = self.read(cr, uid, ids, ['target_project'])[0] return self.compute_date(cr, uid, ids, context=context) diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index cb74649502f..0d5fa22e6a8 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -19,12 +19,8 @@ # ############################################################################## -import datetime - -from tools.translate import _ from osv import osv, fields - class project_compute_tasks(osv.osv_memory): _name = 'project.compute.tasks' _description = 'Project Compute Tasks' diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 0d9e9f381f1..48039112e86 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -19,9 +19,8 @@ # ############################################################################## -import datetime -from tools.translate import _ from osv import fields, osv + class project_schedule_task(osv.osv_memory): _name = "project.schedule.tasks" _description = 'project.schedule.tasks' diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index e3e48f70b86..e7a5a2ee48f 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -18,14 +18,13 @@ # along with this program. If not, see . # ############################################################################## -import time from mx import DateTime - -import netsvc -from osv import fields, osv, orm -import re -import tools +from osv import fields, osv from tools.translate import _ +import re +import time +import tools + class project_scrum_project(osv.osv): _inherit = 'project.project' @@ -333,7 +332,6 @@ class project_scrum_meeting(osv.osv): if context is None: context = {} meeting_id = self.browse(cr, uid, ids)[0] - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email: res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email) if not res: diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py index 1d947de8d56..021d30da687 100644 --- a/addons/project_timesheet/__openerp__.py +++ b/addons/project_timesheet/__openerp__.py @@ -30,9 +30,9 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['base', 'project', 'hr_timesheet_sheet'], + 'depends': ['base', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'], 'init_xml': [], - 'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml"], + 'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"], 'demo_xml': [], 'test': [ 'test/worktask_entry_to_timesheetline_entry.yml', diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 94d0d0687fa..411351f1be1 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -205,21 +205,4 @@ class task(osv.osv): return super(task,self).write(cr, uid, ids, vals, context) task() - -class project_project(osv.osv): - _inherit = "project.project" - - def name_get(self, cr, user, ids, context=None): - if context is None: - context = {} - result = [] - if ids and not isinstance(ids, list): - ids = [ids] - for project in self.browse(cr, user, ids, context): - name = "[%s] %s" % (project.analytic_account_id and project.analytic_account_id.code or '?', project.name) - result.append((project.id, name)) - return result - -project_project() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml new file mode 100644 index 00000000000..b39cb02798e --- /dev/null +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -0,0 +1,35 @@ + + + + + Inherit project form : Invoicing Data + project.project + form + + + + + + + + + + + + + + + + Inherit project search view : Invoicing Data + project.project + search + + + + + + + + + + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 81834ebbdbf..cbe75dd56d3 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -171,9 +171,10 @@ + - + @@ -183,11 +184,13 @@ + + + - - + @@ -261,19 +264,19 @@ domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> - - - - - - - + + + + + + + @@ -293,7 +296,8 @@ - + + @@ -322,19 +326,19 @@ domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> - - - - - - - + + + + + + + @@ -345,15 +349,16 @@ search - + - + + @@ -377,7 +382,7 @@ - Purchase Lines not Invoiced + Purchase Lines Not Invoiced ir.actions.act_window purchase.order.line [('state','in',('confirmed','done')), ('invoiced','=',False)] diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 40a61efbc19..612ea134b4e 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -31,7 +31,7 @@ class purchase_report(osv.osv): _description = "Purchases Orders" _auto = False _columns = { - 'date': fields.date('Order Date', readonly=True), + 'date': fields.date('Order Date', readonly=True, help="Date on which this document has been created"), 'name': fields.char('Year',size=64,required=False, readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'state': fields.selection([('draft', 'Request for Quotation'), @@ -52,11 +52,12 @@ class purchase_report(osv.osv): 'date_approve':fields.date('Date Approved', readonly=True), 'expected_date':fields.date('Expected Date', readonly=True), 'validator' : fields.many2one('res.users', 'Validated By', readonly=True), + 'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), 'delay':fields.float('Days to Validate', digits=(16,2), readonly=True), 'delay_pass':fields.float('Days to Deliver', digits=(16,2), readonly=True), - 'quantity': fields.float('# of Products', readonly=True), + 'quantity': fields.float('Quantity', readonly=True), 'price_total': fields.float('Total Price', readonly=True), 'price_average': fields.float('Average Price', readonly=True, group_operator="avg"), 'negociation': fields.float('Purchase-Standard Price', readonly=True, group_operator="avg"), @@ -89,6 +90,7 @@ class purchase_report(osv.osv): s.create_uid as user_id, s.company_id as company_id, l.product_id, + l.product_uom as product_uom, s.location_id as location_id, sum(l.product_qty*u.factor) as quantity, extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay, @@ -114,6 +116,7 @@ class purchase_report(osv.osv): l.price_unit, s.date_approve, l.date_planned, + l.product_uom, date_trunc('day',s.minimum_planned_date), s.partner_address_id, s.pricelist_id, diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index b8831ed11e0..816efd65ac3 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -25,6 +25,7 @@ + @@ -34,7 +35,7 @@ - + @@ -52,18 +53,18 @@ - - - + + + - - - - + + + + - - - + + + diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml index 99fe1a2eb4d..4f28ccfafcf 100644 --- a/addons/purchase/test/procurement_buy.yml +++ b/addons/purchase/test/procurement_buy.yml @@ -50,7 +50,9 @@ - I run the scheduler. - - !workflow {model: procurement.order, action: button_check, ref: procurement_order_testcase0} + !function {model: procurement.order, name: run_scheduler}: + - model: procurement.order + search: "[]" - I check that purchase order is generated. - @@ -81,14 +83,14 @@ !python {model: stock.picking }: | import time procurement_obj = self.pool.get('procurement.order') - proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] - picking_id = self.search(cr, uid, [('origin', '=', proc_ids.purchase_id.name)]) - if picking_id: - pick=self.browse(cr,uid,picking_id[0]) - move =pick.move_lines[0] + proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + picking_ids = self.search(cr, uid, [('purchase_id', '=', proc_ids.purchase_id.id),('type','=','in')]) + pickings = self.browse(cr, uid, picking_ids) + for picking in pickings: + move = picking.move_lines[0] partial_datas = { - 'partner_id':pick.address_id.partner_id.id, - 'address_id': pick.address_id.id, + 'partner_id': picking.address_id.partner_id.id, + 'address_id': picking.address_id.id, 'delivery_date' : time.strftime('%Y-%m-%d') } partial_datas['move%s'%(move.id)]= { @@ -96,7 +98,7 @@ 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, } - self.do_partial(cr, uid, picking_id,partial_datas) + self.do_partial(cr, uid, [picking.id], partial_datas) - I confirm the Reservation. - diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py index 8d2e17609e8..10bf55570cc 100644 --- a/addons/purchase/wizard/purchase_order_group.py +++ b/addons/purchase/wizard/purchase_order_group.py @@ -24,11 +24,29 @@ from osv import fields, osv import netsvc import pooler from osv.orm import browse_record, browse_null +from tools.translate import _ class purchase_order_group(osv.osv_memory): _name = "purchase.order.group" _description = "Purchase Order Merge" - + + def fields_view_get(self, cr, uid, view_id=None, view_type='form', + context=None, toolbar=False, submenu=False): + """ + Changes the view dynamically + @param self: The object pointer. + @param cr: A database cursor + @param uid: ID of the user currently logged in + @param context: A standard dictionary + @return: New arch of view. + """ + if not context: + context={} + res = super(purchase_order_group, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) + if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2: + raise osv.except_osv(_('Warning'), + _('Please select multiple order to merge in the list view.')) + return res def merge_orders(self, cr, uid, ids, context): """ To merge similar type of purchase orders. diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 13a760c9b87..1e0c4f06838 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -35,7 +35,7 @@ class purchase_requisition(osv.osv): 'date_start': fields.datetime('Requisition Date'), 'date_end': fields.datetime('Requisition Deadline'), 'user_id': fields.many2one('res.users', 'Responsible'), - 'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Tender (exclusive):On the confirmation of a purchase order, it cancels the remaining purchase order.Multiple Requisitions:It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""), + 'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""), 'description': fields.text('Description'), 'company_id': fields.many2one('res.company', 'Company', required=True), 'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}), diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index eed99cefd6c..3daeab14881 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -21,7 +21,7 @@ purchase.order - + @@ -102,10 +102,9 @@ tree purchase.requisition - + - @@ -125,19 +124,20 @@ + - - - - - - + + + + + + @@ -150,7 +150,7 @@ purchase.requisition form tree,form - {"search_default_user_id":uid} + {"search_default_create_uid":uid,'search_default_draft': 1} diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml index 6214c4fad51..d994ba71405 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml @@ -7,10 +7,10 @@ form
+ -