From 5ec8cd1146a15d170c5f460f570f38b6037889b9 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Mon, 23 May 2011 18:04:04 +0530 Subject: [FIX] analytic:Wrong adaptation of the partner address in the Project view lp bug: https://launchpad.net/bugs/781189 fixed bzr revid: ara@tinyerp.com-20110523123404-zjqi69go1ecv36f1 --- addons/analytic/analytic.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'addons/analytic') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 6dfaac21e70..e487a742e47 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -236,6 +236,13 @@ class account_analytic_account(osv.osv): res['value']['partner_id'] = partner return res + def onchange_partner_id(self, cr, uid, ids, partner, context=None): + partner_obj = self.pool.get('res.partner') + if not partner: + return {'value':{'contact_id': False}} + address = partner_obj.address_get(cr, uid, [partner], ['contact']) + return {'value':{'contact_id': address['contact']}} + def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100): if not args: args=[] -- cgit v1.2.3 From 9073a54e412861a2563ab6ded5140458c59ce7e0 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 1 Dec 2011 14:48:31 +0100 Subject: [IMP] to fix bzr revid: fp@tinyerp.com-20111201134831-w2t5psf00vrwnqwi --- addons/analytic/analytic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 114653d473e..6827a139c8b 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -161,7 +161,7 @@ class account_analytic_account(osv.osv): 'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), - 'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'), + 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of quantity of hours.'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'contact_id': fields.many2one('res.partner.address', 'Contact'), 'user_id': fields.many2one('res.users', 'Account Manager'), -- cgit v1.2.3 From 4e0befa1f4d944c3265d780f421a72fd64a878b2 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 6 Dec 2011 13:03:55 +0100 Subject: [IMP] better manifests on modules bzr revid: fp@tinyerp.com-20111206120355-h5vufbibzovtvf0j --- addons/analytic/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic') diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py index 65f6588a1e3..4e10e243d61 100644 --- a/addons/analytic/__openerp__.py +++ b/addons/analytic/__openerp__.py @@ -24,7 +24,7 @@ "version": "1.1", "author" : "OpenERP SA", "website" : "http://www.openerp.com", - "category" : "Hidden", + "category": 'Accounting & Finance', "depends" : ["base", "decimal_precision"], "description": """ Module for defining analytic accounting object. -- cgit v1.2.3 From 63ad3f6af72552febb356656c19209aeaea17c92 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 8 Dec 2011 16:26:58 +0100 Subject: [IMP] Contracts management bzr revid: fp@tinyerp.com-20111208152658-9ahc2i138gztg7y1 --- addons/analytic/analytic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 3ea5cec848a..2ecaeee0f15 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -161,7 +161,7 @@ class account_analytic_account(osv.osv): 'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), - 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of quantity of hours.'), + 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'contact_id': fields.many2one('res.partner.address', 'Contact'), 'user_id': fields.many2one('res.users', 'Account Manager'), -- cgit v1.2.3 From 59b89d88fd3622b4f3f228cde83734ad6861e3c1 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 9 Dec 2011 05:17:13 +0000 Subject: Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20111209044622-gxexxlpiqihjzreq bzr revid: launchpad_translations_on_behalf_of_openerp-20111209051713-2iirb6c9d6ihwtwu --- addons/analytic/i18n/hr.po | 255 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 addons/analytic/i18n/hr.po (limited to 'addons/analytic') diff --git a/addons/analytic/i18n/hr.po b/addons/analytic/i18n/hr.po new file mode 100644 index 00000000000..2ff7a50e37b --- /dev/null +++ b/addons/analytic/i18n/hr.po @@ -0,0 +1,255 @@ +# Croatian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-12-08 15:42+0000\n" +"Last-Translator: Goran Kliska \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n" +"X-Generator: Launchpad (build 14450)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "Podređena konta" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "Naziv konta" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "Stanje" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "Voditelj računovodstva" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "Nacrt" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "Zatvoren" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "Duguje" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "" +"* When an account is created its in 'Draft' state. " +" \n" +"* If any associated partner is there, it can be in 'Open' state. " +" \n" +"* If any pending balance is there it can be in 'Pending'. " +" \n" +"* And finally when all the transactions are over, it can be in 'Close' " +"state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. " +"If its in 'Running' state it is a normal project. " +" \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "Vrsta konta" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "Predložak" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "U toku" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "Analitičke stavke" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "Opis" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "Običan" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "Organizacija" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "Maksimalna količina" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "Korisnik" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "Nadređeni analitički konto" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "Datum" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Account currency" +msgstr "Valuta konta" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "Količina" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "Potražuje" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "Iznos" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "Kontakt" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "Greška! Valuta ne odgovara valuti organizacije." + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "Otkazano" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "Saldo" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Greška! Ne možete kreirati rekurzivna analitička konta." + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "Završni datum" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "Šifra konta" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "Puni naziv konta" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "Analitički konto" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "Pogled" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "Početni datum" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "Otvoren" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "Stavke analitike" -- cgit v1.2.3 From c0755c42187739697de16f90ec970f2e3478a26c Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 12 Dec 2011 14:35:23 +0100 Subject: [IMP] account, analytic, auction: add group categories bzr revid: rco@openerp.com-20111212133523-ea0r5b47mc5tddl7 --- addons/analytic/security/analytic_security.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/analytic') diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index 165bb92f6b9..3f8ec1036be 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -16,6 +16,7 @@ - Useability / Analytic Accounting + Analytic Accounting + -- cgit v1.2.3 From 81c1bf7fcbb601dd80114f3bc3e91624c0ccb2a6 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 12 Dec 2011 15:22:44 +0100 Subject: [IMP] better manifests for modules bzr revid: fp@tinyerp.com-20111212142244-cm6e3um1adizu3kz --- addons/analytic/__openerp__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/analytic') diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py index 4e10e243d61..33f1f281851 100644 --- a/addons/analytic/__openerp__.py +++ b/addons/analytic/__openerp__.py @@ -20,11 +20,11 @@ ############################################################################## { - "name" : "Analytic Account", + "name" : "Analytic Accounting", "version": "1.1", "author" : "OpenERP SA", "website" : "http://www.openerp.com", - "category": 'Accounting & Finance', + "category": 'Hidden/Dependency', "depends" : ["base", "decimal_precision"], "description": """ Module for defining analytic accounting object. -- cgit v1.2.3 From f27318c8af85955ef23b709f5fe7f87ee0974bb3 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 12 Dec 2011 19:11:13 +0100 Subject: [IMP] Security Rule: removed duplicates due to inheritancies of groups bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp --- addons/analytic/security/ir.model.access.csv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/analytic') diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv index 0a6c192eb56..4a08a4aa60d 100644 --- a/addons/analytic/security/ir.model.access.csv +++ b/addons/analytic/security/ir.model.access.csv @@ -1,2 +1 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" - +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -- cgit v1.2.3