-
+
@@ -417,7 +417,7 @@
-
+
-
+
-
+
diff --git a/addons/product/product.py b/addons/product/product.py
index f8f96ff69de..18c9e6ded8d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -262,7 +262,7 @@ class product_template(osv.osv):
'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'rental': fields.boolean('Can be Rent'),
- 'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
+ 'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Account'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price."),
'volume': fields.float('Volume', help="The volume in m3."),
@@ -586,7 +586,7 @@ class product_packaging(osv.osv):
_rec_name = 'ean'
_columns = {
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of packaging."),
- 'name' : fields.char('Description', size=64),
+ 'name' : fields.text('Description', size=64),
'qty' : fields.float('Quantity by Package',
help="The total number of products you can put by pallet or box."),
'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
@@ -645,9 +645,9 @@ class product_supplierinfo(osv.osv):
_name = "product.supplierinfo"
_description = "Information about a product supplier"
_columns = {
- 'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
- 'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
- 'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
+ 'name' : fields.many2one('res.partner', 'Supplier', required=True, ondelete='cascade', help="Supplier of this product"),
+ 'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
+ 'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 360ffef25eb..371d299e7aa 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -18,17 +18,17 @@
-
-
-
-
-
+
+
+
+
+
@@ -104,7 +104,7 @@
-
+
@@ -175,8 +175,8 @@
-
-
+
+
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 17d9010ed43..a253a0e00af 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,16 +10,17 @@
form
-
+
-
-
+
+
+
+
+
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
index 2322b2ce98e..e1bcf6839fc 100644
--- a/addons/profile_accounting/i18n/pl.po
+++ b/addons/profile_accounting/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:59+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 16:49+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_accounting
@@ -23,6 +23,8 @@ msgid ""
"Profile you selected. You will be able to install them based on our "
"requirements."
msgstr ""
+"Instaluj więcej modułów. Proponujemy moduły zalecane do profilu księgowego, "
+"który wybrałeś. Będziesz mógł je instalować według naszych wskazań."
#. module: profile_accounting
#: constraint:ir.model:0
@@ -35,7 +37,7 @@ msgstr ""
#. module: profile_accounting
#: view:profile.accounting.config.install_modules_wizard:0
msgid "Services Management"
-msgstr ""
+msgstr "Zarządzanie usługami"
#. module: profile_accounting
#: help:profile.accounting.config.install_modules_wizard,board_document:0
@@ -45,51 +47,55 @@ msgid ""
"documents, printed reports, calendar system). It opens an FTP access for the "
"users to easily browse association's document."
msgstr ""
+"System zarządzania dokumentami w OpenERP pozwala przechowywać, przeglądać, "
+"automatycznie indeksować, przeszukiwać i podglądać wszystkie rodzaje "
+"dokumentów (dokumenty wewnętrzne, drukowane raporty, kalendarze). Otwiera on "
+"dla użytkowników dostęp FTP do łatwego przeglądania powiązanych dokumentów."
#. module: profile_accounting
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: profile_accounting
#: view:profile.accounting.config.install_modules_wizard:0
msgid "Resources Management"
-msgstr ""
+msgstr "Zarządzanie zasobami"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,account_payment:0
msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Zarządzanie płatnościami dla dostawców"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,account_asset:0
msgid "Asset Management"
-msgstr ""
+msgstr "Środki trwałe"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Planowanie analityczne"
#. module: profile_accounting
#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
+msgstr "Profil księgowy: Instaluj dodatkowe moduły"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
msgid "Invoice on Analytic Entries"
-msgstr ""
+msgstr "Faktura z zapisów analitycznych"
#. module: profile_accounting
#: model:ir.module.module,description:profile_accounting.module_meta_information
msgid "Profile for Accounting"
-msgstr ""
+msgstr "Profil dla księgowości"
#. module: profile_accounting
#: help:profile.accounting.config.install_modules_wizard,account_budget:0
msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
+msgstr "Pomaga zarządzać budżetami finansowymi i analitycznymi."
#. module: profile_accounting
#: constraint:ir.ui.view:0
@@ -99,37 +105,37 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,name:0
msgid "Name"
-msgstr ""
+msgstr "Nazwa"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,account_budget:0
msgid "Budgets"
-msgstr ""
+msgstr "Budżety"
#. module: profile_accounting
#: view:profile.accounting.config.install_modules_wizard:0
msgid "Install"
-msgstr ""
+msgstr "Instaluj"
#. module: profile_accounting
#: view:profile.accounting.config.install_modules_wizard:0
msgid "Install Extra Module"
-msgstr ""
+msgstr "Instaluj dodatkowe moduły"
#. module: profile_accounting
#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
msgid "Accounting only profile"
-msgstr ""
+msgstr "Profil tylko księgowy"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
msgid "Analytic Accounting"
-msgstr ""
+msgstr "Księgowość analityczna"
#. module: profile_accounting
#: field:profile.accounting.config.install_modules_wizard,board_document:0
msgid "Document Management"
-msgstr ""
+msgstr "Zarządzanie dokumentami"
#. module: profile_accounting
#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
@@ -139,4 +145,4 @@ msgstr ""
#. module: profile_accounting
#: view:profile.accounting.config.install_modules_wizard:0
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
index 4a7c7de9f7b..6707d6598b1 100644
--- a/addons/profile_manufacturing/i18n/pl.po
+++ b/addons/profile_manufacturing/i18n/pl.po
@@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:28+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 16:49+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Operacje produkcyjne"
#. module: profile_manufacturing
#: model:ir.module.module,description:profile_manufacturing.module_meta_information
msgid "Profile for manufacturing industries"
-msgstr ""
+msgstr "Profil dla firm produkcyjnych"
#. module: profile_manufacturing
#: constraint:ir.model:0
@@ -37,22 +37,22 @@ msgstr ""
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
msgid "Just in Time Scheduling"
-msgstr ""
+msgstr "Planowanie natychmiastowe (JiT)"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
msgid "Manage by Journals"
-msgstr ""
+msgstr "Zarządzanie wg dzienników"
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Relationship Management"
-msgstr ""
+msgstr "Zarządzanie relacjami"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,portal:0
msgid "This module allows you to manage a Portal system."
-msgstr ""
+msgstr "Ten moduł pozwoli ci zarządzać systemem portalu."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -62,6 +62,10 @@ msgid ""
"documents, printed reports, calendar system). It opens an FTP access for the "
"users to easily browse association's document."
msgstr ""
+"System zarządzania dokumentami w OpenERP pozwala przechowywać, przeglądać, "
+"automatycznie indeksować, przeszukiwać i podglądać wszystkie rodzaje "
+"dokumentów (dokumenty wewnętrzne, drukowane raporty, kalendarze). Otwiera on "
+"dla użytkowników dostęp FTP do łatwego przeglądania powiązanych dokumentów."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
@@ -70,17 +74,20 @@ msgid ""
"journals. You can define journals for trucks, salesman, departments, "
"invoicing date delivery period, etc."
msgstr ""
+"Ten moduł pozwala zarządzać sprzedażą, fakturowaniem i pobieraniem produktów "
+"przez dzinniki. Możesz definiować dzienniki dla ciężarówek, sprzedawców, "
+"działów, dat fakturowania, okresów dostaw itp."
#. module: profile_manufacturing
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: profile_manufacturing
#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
+msgstr "Profil produkcyjny: Instaluj dodatkowe moduły"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
@@ -89,6 +96,9 @@ msgid ""
"and faster for real time stock computation but, in counter-part, it manages "
"less efficiently priorities in procurements."
msgstr ""
+"Moduł JIT pozwala działać planiście bez jego uruchamiania. Jest to szybsze i "
+"łatwiejsze dla obliczeń zapasów w czasie rzeczywistym, ale nieefektywne w "
+"zarządzaniu priorytetami w nabyciach."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
@@ -97,11 +107,15 @@ msgid ""
"work order/operation. You will be able to planify, analyse the cost, check "
"times, ... on all operations of each manufacturing order"
msgstr ""
+"Ten moduł pozwala nie tylko zarządzać produkcją przez zamówienia produkcji, "
+"ale również przez zamówienia czynności/operacje. Będziesz mógł planować, "
+"analizować koszt, sprawdzać czas, ... dla wszystkich operacji w każdym "
+"zamówieniu produkcyjnym"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
msgid "Document Management"
-msgstr ""
+msgstr "Zarządzanie dokumentami"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,portal:0
@@ -111,7 +125,7 @@ msgstr ""
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Stock & Manufacturing"
-msgstr ""
+msgstr "Zapasy i Produkcja"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
@@ -119,6 +133,8 @@ msgid ""
"Allow to manage product repairs. Handle the guarantee limit date and the "
"invoicing of products and services."
msgstr ""
+"Pozwala zarządzać naprawami produktów. Obsługuje czasy gwarancji i "
+"fakturowanie produktów i usług."
#. module: profile_manufacturing
#: constraint:ir.ui.view:0
@@ -132,16 +148,20 @@ msgid ""
"manufacturing profile you selected. You will be able to install them based "
"on our requirements."
msgstr ""
+"Instaluj więcej modułów. Proponujemy moduły zalecane do profilu "
+"produkcyjnego, który wybrałeś. Będziesz mógł je instalować według naszych "
+"wskazań."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
msgid "This module allows you to add sub poducts in mrp bom."
msgstr ""
+"Ten moduł pozwala dodać produkty uboczne w zestawieniu materiałowym MRP."
#. module: profile_manufacturing
#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
msgid "Manufacturing industry profile"
-msgstr ""
+msgstr "Profil firm produkcyjnych"
#. module: profile_manufacturing
#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
@@ -155,26 +175,28 @@ msgid ""
"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
"on."
msgstr ""
+"To instaluje funkcjonalność relacji z klientami jak: obsługa sygnałów i "
+"szans, współdzielone kalendarze, obsadzanie stanowisk, obsługa błędów itp."
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Install"
-msgstr ""
+msgstr "Instaluj"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
msgid "CRM and Calendars"
-msgstr ""
+msgstr "CRM i kalendarze"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
msgid "Repair"
-msgstr ""
+msgstr "Naprawa"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
msgid "Display margins on the sale order form."
-msgstr ""
+msgstr "Wyświetlaj marże na formularzu zamówienia sprzedaży."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
@@ -184,26 +206,30 @@ msgid ""
"a perfect ergonomy with touchscreen materials and payment processing "
"hardware."
msgstr ""
+"Ten moduł pozwala obsługiwać punkt sprzedaży. Zawiera podstawową formę "
+"operacji punktu sprzedaży. Musisz sprawdzić jeszcze nasz punkt sprzedaży dla "
+"sprzedawcy (frontend), zby się przekonać o ergonomii ekranu dotykowego i "
+"urządzeń do obsługi płatności."
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
msgid "Mrp Sub Product"
-msgstr ""
+msgstr "Produkt uboczny MRP"
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Sales Management"
-msgstr ""
+msgstr "Sprzedaż"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,warning:0
msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
msgid "Margins on Sales Order"
-msgstr ""
+msgstr "Marże w zamówieniu sprzedaży"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
@@ -214,18 +240,23 @@ msgid ""
"managing a manufacturing chain, a quality control location, product that you "
"rent, etc."
msgstr ""
+"Pozwala zarządzać zaawansowaną logistyką z różnymi strefami. Możesz "
+"zdefiniować, według produktu: domyślną strefę, ścieżkę stref dla różnych "
+"operacji, itp. Moduł ten jest zwykle stosowany do: lokalizacji produktów, "
+"zarządzania łańcuchem produkcyjnym, stref kontroli jakości, produktów "
+"wypożyczanych, itp."
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
msgid "Point of Sale"
-msgstr ""
+msgstr "Punkt sprzedaży"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
msgid "Advanced Locations"
-msgstr ""
+msgstr "Zaawansowane strefy"
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index cd6839344dc..a10b7348ccb 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-13 17:05+0000\n"
+"PO-Revision-Date: 2010-05-25 15:03+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
@@ -1130,7 +1130,7 @@ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych projektów."
#. module: project
#: field:project.task,date_deadline:0
msgid "Deadline"
-msgstr "Ostateczny czas ukończenia"
+msgstr "Termin"
#. module: project
#: wizard_field:project.task.delegate,init,user_id:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4b86f5e9238..eef99db6cec 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -122,7 +122,7 @@
-
+
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 75e8d01ba41..a978587e232 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -55,10 +55,10 @@
-
-
@@ -98,26 +98,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -133,6 +118,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 068c42bee8d..39c8b03565e 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-22 14:25+0000\n"
+"PO-Revision-Date: 2010-05-25 10:02+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
@@ -37,7 +37,7 @@ msgstr ""
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
msgid "My Deadlines"
-msgstr ""
+msgstr "Moje terminy"
#. module: project_gtd
#: selection:project.gtd.timebox,type:0
@@ -83,7 +83,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: project_gtd
#: field:project.gtd.timebox,context4_id:0
msgid "Context 4"
-msgstr ""
+msgstr "Kontekst 4"
#. module: project_gtd
#: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
@@ -110,7 +110,7 @@ msgstr ""
#. module: project_gtd
#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "GTD - personalny moduł zarządzania czasem"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
@@ -140,7 +140,7 @@ msgstr ""
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
msgid "My Pending Tasks"
-msgstr ""
+msgstr "Moje zadania oczekujące"
#. module: project_gtd
#: view:project.gtd.timebox:0
@@ -166,17 +166,17 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,context1_id:0
msgid "Context 1"
-msgstr ""
+msgstr "Kontekst 1"
#. module: project_gtd
#: field:project.gtd.timebox,context2_id:0
msgid "Context 2"
-msgstr ""
+msgstr "Kontekst 2"
#. module: project_gtd
#: field:project.gtd.timebox,context3_id:0
msgid "Context 3"
-msgstr ""
+msgstr "Kontekst 3"
#. module: project_gtd
#: wizard_button:project.gtd.timebox.fill,init,process:0
@@ -186,12 +186,12 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,context5_id:0
msgid "Context 5"
-msgstr ""
+msgstr "Kontekst 5"
#. module: project_gtd
#: field:project.gtd.timebox,context6_id:0
msgid "Context 6"
-msgstr ""
+msgstr "Kontekst 6"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
@@ -244,18 +244,18 @@ msgstr "Kontekst"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
msgid "My Open Tasks"
-msgstr ""
+msgstr "Moje otwarte zadania"
#. module: project_gtd
#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
#: model:ir.ui.menu,name:project_gtd.menu_open_time
msgid "Time Management"
-msgstr ""
+msgstr "Zarządzanie czasem"
#. module: project_gtd
#: view:project.task:0
msgid "Getting Things Done"
-msgstr ""
+msgstr "GTD - planowanie osobiste"
#. module: project_gtd
#: field:project.gtd.timebox,task1_ids:0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 40366bc26bd..d37fd6fa6bd 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -201,7 +201,7 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,49 +173,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 353fe6c28c1..c48ff73b0f0 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -34,13 +34,11 @@ from tools.translate import _
class project_issue(osv.osv):
_inherit = 'project.issue'
-
_columns = {
'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
- 'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
- domain="[('partner_id', '=', partner_id)]",
- required=True),
+ 'analytic_account_id': fields.related('project_id','category_id',string='Analytic Account')
}
+project_issue()
class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
@@ -53,10 +51,8 @@ account_analytic_line()
class hr_analytic_issue(osv.osv):
_inherit = 'hr.analytic.timesheet'
-
_columns = {
'issue_id' : fields.many2one('project.issue', 'Issue'),
}
-
hr_analytic_issue()
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2ed2e7fbdcc..12171d0a429 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -9,11 +9,11 @@
-
+
-
-
+
+
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fafc2a14aa4..68acf499551 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -208,7 +208,7 @@
-
+
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 22c5097c897..4a9dba81362 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-10 21:08+0000\n"
+"PO-Revision-Date: 2010-05-25 15:08+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_procuretasktask0
msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "Dla każdego produktu o typie usługa i na zamówienie"
#. module: project_mrp
#: model:process.node,name:project_mrp.process_node_mrptask0
@@ -31,7 +31,7 @@ msgstr "Zadanie"
#: model:process.transition,note:project_mrp.process_transition_ordertask0
msgid "If procure method is Make to order and supply method is produce"
msgstr ""
-"Jeśli metoda nabycia jest \"Na zamówienie' i metoda zaopatrzenia jest "
+"Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
"'Produkcja'"
#. module: project_mrp
@@ -57,29 +57,29 @@ msgstr "Zarządzanie projektami - Integracja ze sprzedażą i MRP"
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_procuretask0
msgid "Procure Task"
-msgstr ""
+msgstr "Utwórz zadanie"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_mrptask0
msgid "A task is created to provide the service."
-msgstr ""
+msgstr "Utworzono zadanie dla wykonywanej usługi"
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_ordertask0
msgid "Order Task"
-msgstr ""
+msgstr "Zamów zadanie"
#. module: project_mrp
#: model:process.node,name:project_mrp.process_node_saleordertask0
msgid "Sale Order Task"
-msgstr ""
+msgstr "Zadanie do zamówienia sprzedaży"
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_createtask0
msgid "Create Task"
-msgstr ""
+msgstr "Utwórz zadanie"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_saleordertask0
msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "W przypadku sprzedaży usług na zamówienie sprzedaży"
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 6d000c26b4f..79ee7725dc6 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -7,21 +7,21 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:12+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 15:04+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
#: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
msgid "Project Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy projektu"
#. module: project_timesheet
#: field:project.task.work,hr_analytic_timesheet_id:0
msgid "Related Timeline Id"
-msgstr ""
+msgstr "ID związanej karty czasu pracy"
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index bd94592dee9..111c389c7e8 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -80,7 +80,7 @@
-
+
@@ -98,7 +98,7 @@
domain="[('priority','=','4')]"/>
-
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 218bc83db13..4638d6cd87b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -165,7 +165,7 @@
-
+
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 70883b5eb05..87ca0c25295 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -92,7 +92,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -117,28 +139,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 62e66f98a55..57bfcc280f0 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -129,7 +129,7 @@
-
+
diff --git a/addons/report_analytic/i18n/pl.po b/addons/report_analytic/i18n/pl.po
index 906dafc61c1..f3004d61990 100644
--- a/addons/report_analytic/i18n/pl.po
+++ b/addons/report_analytic/i18n/pl.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:36+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 16:48+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_analytic
#: model:ir.model,name:report_analytic.model_report_analytic_account_close
msgid "Analytic account to close"
-msgstr ""
+msgstr "Konto analityczne do zamknięcia"
#. module: report_analytic
#: constraint:ir.model:0
@@ -32,7 +32,7 @@ msgstr ""
#. module: report_analytic
#: field:report.analytic.account.close,quantity_max:0
msgid "Max. Quantity"
-msgstr ""
+msgstr "Maksymalna ilość"
#. module: report_analytic
#: constraint:ir.ui.view:0
@@ -42,27 +42,27 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#. module: report_analytic
#: field:report.analytic.account.close,name:0
msgid "Analytic account"
-msgstr ""
+msgstr "Konto analityczne"
#. module: report_analytic
#: field:report.analytic.account.close,state:0
msgid "State"
-msgstr ""
+msgstr "Stan"
#. module: report_analytic
#: field:report.analytic.account.close,date_deadline:0
msgid "Deadline"
-msgstr ""
+msgstr "Termin"
#. module: report_analytic
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: report_analytic
#: model:ir.module.module,shortdesc:report_analytic.module_meta_information
msgid "Analytic Account Reporting"
-msgstr ""
+msgstr "Raportowanie kont analitycznych"
#. module: report_analytic
#: field:report.analytic.account.close,partner_id:0
@@ -72,16 +72,16 @@ msgstr ""
#. module: report_analytic
#: field:report.analytic.account.close,balance:0
msgid "Balance"
-msgstr ""
+msgstr "Saldo"
#. module: report_analytic
#: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
#: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
#: view:report.analytic.account.close:0
msgid "Expired analytic accounts"
-msgstr ""
+msgstr "Konta analityczne przeterminowane"
#. module: report_analytic
#: field:report.analytic.account.close,quantity:0
msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 6c6349cddae..41c60e27562 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -16,10 +16,10 @@
-
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -52,13 +52,14 @@
-
+
+
@@ -72,7 +73,7 @@
-
+
@@ -87,7 +88,7 @@
-
+
@@ -164,11 +165,11 @@
-
+
-
+
@@ -179,10 +180,10 @@
-
+
-
+
@@ -201,7 +202,7 @@
-
+
@@ -217,7 +218,7 @@
-
+
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index c8b616ced78..e713c479f72 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -36,16 +36,15 @@ class sale_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
- 'product_qty':fields.float('Qty', readonly=True),
+ 'product_qty':fields.float('# of Qty', readonly=True),
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
- 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
- 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
'price_total':fields.float('Total Price', readonly=True),
- 'delay':fields.float('Avg Closing Days', digits=(16,2), readonly=True),
+ 'delay':fields.float('Days to Close', digits=(16,2), readonly=True),
'price_average':fields.float('Average Price', readonly=True),
+ 'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
'state': fields.selection([
('draft', 'Quotation'),
@@ -57,12 +56,8 @@ class sale_report(osv.osv):
('done', 'Done'),
('cancel', 'Cancelled')
], 'Order State', readonly=True),
- 'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
- 'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact Name', readonly=True),
- 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address Name', readonly=True),
- 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True),
+ 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
- 'date_confirm': fields.date('Confirmation Date', readonly=True)
}
_order = 'date desc'
def init(self, cr):
@@ -80,42 +75,32 @@ class sale_report(osv.osv):
s.partner_id as partner_id,
s.user_id as user_id,
s.shop_id as shop_id,
- s.fiscal_position as fiscal_position,
- s.payment_term as payment_term,
s.company_id as company_id,
extract(epoch from avg(s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
sum(l.product_uom_qty*l.price_unit) as price_total,
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
count(*) as nbr,
s.state,
- s.partner_invoice_id as partner_invoice_id,
- s.partner_order_id as partner_order_id,
- s.partner_shipping_id as partner_shipping_id,
+ pt.categ_id,
s.pricelist_id as pricelist_id,
- s.project_id as analytic_account_id,
- s.date_confirm as date_confirm
+ s.project_id as analytic_account_id
from
sale_order_line l
- left join
- sale_order s on (s.id=l.order_id)
- left join product_uom u on (u.id=l.product_uom)
+ left join sale_order s on (s.id=l.order_id)
+ left join product_uom u on (u.id=l.product_uom)
+ left join product_template pt on (pt.id=l.product_id)
group by
s.date_order,
s.partner_id,
l.product_id,
l.product_uom,
s.user_id,
+ pt.categ_id,
s.state,
s.shop_id,
s.company_id,
- s.fiscal_position,
- s.payment_term,
- s.partner_invoice_id,
- s.partner_order_id,
- s.partner_shipping_id,
s.pricelist_id,
- s.project_id,
- s.date_confirm
+ s.project_id
)
""")
sale_report()
@@ -212,7 +197,7 @@ class product_bought_by_sale_order(osv.osv):
where
s.state='manual' or s.state='progress'
group by
- l.product_id, to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY')
+ l.product_id, to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY')
)
""")
product_bought_by_sale_order()
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 332a551ec5d..309dc9e57c6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -1,35 +1,31 @@
+
sale.report.treesale.reporttree
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
@@ -39,9 +35,10 @@
sale.reportgraph
-
+
+
@@ -51,47 +48,58 @@
sale.reportsearch
-
+
-
-
+
+
+ string=" 7 Days "
+ separator="1"
+ domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+ help="Tasks during last 7 days"/>
+ string="Quotations"
+ domain="[('state','=','draft')]"/>
-
-
+ string="Sales"
+ domain="[('state','not in',('draft','done','cancel'))]"/>
+
+
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -114,36 +122,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Sales Orders
+ Sales Analysissale.reportformtree,graph
@@ -154,8 +138,8 @@
-
-
+
+ sale.order.by.clients.treesale.order.by.clientstree
@@ -220,7 +204,7 @@
-
+ product.bought.by.sale.order.treeproduct.bought.by.sale.ordertree
@@ -287,5 +271,6 @@
tree,graph
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 890abe49bb1..c5f41af00a6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -226,7 +226,7 @@ class sale_order(osv.osv):
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}),
'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
- 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}),
+ 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sale order"),
'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3),
'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
@@ -242,7 +242,7 @@ class sale_order(osv.osv):
- The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
- The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
- The 'Invoice from the picking' choice is used to create an invoice during the picking process."""),
- 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+ 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current sale order"),
'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
@@ -291,7 +291,7 @@ class sale_order(osv.osv):
'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
- 'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist.id,
+# 'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist.id,
}
_order = 'name desc'
@@ -829,7 +829,7 @@ class sale_order_line(osv.osv):
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+ 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}),
'product_uos': fields.many2one('product.uom', 'Product UoS'),
'product_packaging': fields.many2one('product.packaging', 'Packaging'),
@@ -1041,7 +1041,7 @@ class sale_order_line(osv.osv):
if product_obj.uos_id.category_id.id != uos2.category_id.id:
uos = False
else:
- uos = False
+ uos = False
if product_obj.description_sale:
result['notes'] = product_obj.description_sale
fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4ef2f739bc5..fa082d8fdfb 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -226,7 +226,7 @@
-
+