[MERGE]

bzr revid: uco@tinyerp.com-20100806054301-aps3n4x36yiqe781

addons/crm/crm_lead.py

@@ -40,7 +40,7 @@ class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead"
-    _order = "priority, id desc"
+    _order = "date_action, priority, id desc"
     _inherit = ['mailgate.thread','res.partner.address']
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """

addons/hr/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-08-03 04:57+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-05 20:50+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\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-08-04 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-06 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -36,13 +36,13 @@ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych działów"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "NIP"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Zasoby kadrowe"
+msgstr "Kadry"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
@@ -141,7 +141,7 @@ msgstr "Struktura pracowników"
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "ID"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -330,7 +330,7 @@ msgstr "Utwórz użytkownika OpenERP"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr ""
+msgstr "Formularz pracownika"
 
 #. module: hr
 #: view:hr.department:0
@@ -431,7 +431,7 @@ msgstr "Narodowość"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other ID"
-msgstr ""
+msgstr "Inne ID"
 
 #. module: hr
 #: field:hr.timesheet,name:0

addons/hr_holidays/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: 2010-08-03 06:06+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-05 19:25+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\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-08-04 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-06 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -34,7 +34,7 @@ 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 wolnych"
+msgstr "Pozostało dni urlopu"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
@@ -79,7 +79,7 @@ msgstr "Ustaw na projekt"
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr "Dni wolne od pracy"
+msgstr "Urlopy"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -150,7 +150,7 @@ msgstr "Uwagi"
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr "Stan dni wolnych"
+msgstr "Rodzaj urlopu"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
@@ -180,12 +180,12 @@ msgstr "Urlop został ustawiony w kalendarzu"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr "Stan urlopu"
+msgstr "Rodzaje urlopu"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr "Stany urlopów"
+msgstr "Rodzaje urlopu"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
@@ -200,7 +200,7 @@ msgstr "Dozwolone urlopy"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
 msgid "Legal Declaration Document to declare new employee"
-msgstr ""
+msgstr "Formalny dokument deklaracji składanej przez nowego pracownika"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -215,7 +215,7 @@ msgstr "Urlopy na użytkownika"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Define holiday status"
-msgstr "Zdefiniuj stan urlopu"
+msgstr "Zdefiniuj rodzaj urlopu"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
@@ -271,7 +271,7 @@ msgstr "Pracownik dostaje urlop"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
-msgstr ""
+msgstr "Jasno-łososiowy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -299,7 +299,7 @@ msgstr "Liczba dni"
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr "Stan urlopu"
+msgstr "Rodzaj urlopu"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
@@ -320,7 +320,7 @@ msgstr "Jego zwierzchnik zaaprobował wniosek"
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
 msgid "If holidays available, employee can take it and fill it."
-msgstr ""
+msgstr "Jeśli urlop jest dostępny, to pracownik może o niego wnioskować"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary.employee,notify:0
@@ -330,7 +330,7 @@ msgstr "Musisz wybrać co najmniej jednego pracownika. Spróbuj ponownie."
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
 msgid "My Validated Holidays Requests"
-msgstr ""
+msgstr "Moje wnioski urlopowe - zatwierdzone"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
@@ -357,7 +357,7 @@ msgstr "Pozwól przekroczyć limit"
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_user_id:0
 msgid "Holidays user"
-msgstr ""
+msgstr "Użytkownik urlopu"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -456,7 +456,7 @@ msgstr "Czarny"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
 msgid "My Refused Holidays Requests"
-msgstr "Moje odrzucone wnioski o urlop"
+msgstr "Moje wnioski urlopowe - odrzucone"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_setholiday0
@@ -466,7 +466,7 @@ msgstr "Ustaw urlop"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
 msgid "My Draft Holidays Requests"
-msgstr "Moje projekty wniosków urlopowych"
+msgstr "Moje wnioski urlopowe - projekty"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,max_leaves:0
@@ -491,7 +491,7 @@ msgstr "Moje wnioski urlopowe"
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr "Kolor stanu"
+msgstr "Kolor dla rodzaju"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
@@ -601,7 +601,7 @@ msgstr "Zatwierdzony"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr "Moje odrzucone wnioski o urlop"
+msgstr "Moje wnioski urlopowe - odrzucone"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
@@ -658,7 +658,7 @@ msgstr "Wybierz typ urlopu"
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
-msgstr "Przypadek"
+msgstr "Sprawa"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
@@ -688,7 +688,7 @@ msgstr "Czerwony"
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr "Zasoby ludzkie: zarządzanie urlopami"
+msgstr "Kadry: Urlopy"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
@@ -703,7 +703,7 @@ msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie."
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
 msgid "My Holidays Request Validated"
-msgstr "Moje zatwierdzone wnioski urlopowe"
+msgstr "Moje wnioski urlopowe - zatwierdzone"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_req_id:0

addons/hr_payroll/hr_payroll.py

@@ -380,13 +380,14 @@ class payroll_advice(osv.osv):
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
 
-    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+    def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
         res = {}
         if context is None:
             context = {}
         if company_id:
             company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
-            res.update({'bank': company.partner_id.bank_ids[0].bank.name})
+            if company.partner_id.bank_ids:
+                res.update({'bank': company.partner_id.bank_ids[0].bank.name})
         return {
             'value':res
         }

addons/sale_margin/__openerp__.py

@@ -29,6 +29,7 @@
     "author":"OpenERP SA",
     "depends":["sale"],
     "demo_xml":[],
+    'test': ['test/sale_margin.yml'],
     "update_xml":["security/ir.model.access.csv","sale_margin_view.xml","report/report_margin_view.xml"],
     "active": False,
     "installable": True,

addons/sale_margin/test/sale_margin.yml

@@ -0,0 +1,66 @@
+-
+  In order to test the sale_margin module in OpenERP,
+  I create a sale order and verify its margin
+-
+   I place a sale order for product keyboard, quantity 50
+-
+  !record {model: sale.order, id: sale_order_so11}:
+    date_order: '2010-08-04'
+    invoice_quantity: order
+    name: Test_SO011
+    order_line:
+      - name: '[KEYA] Keyboard - AZERTY'
+        price_unit: 7.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 100.0
+        state: draft
+        delay: 7.0
+        product_id: product.product_product_24
+        product_uos_qty: 100.0
+        th_weight: 0.0
+        type: make_to_stock
+    order_policy: manual
+    partner_id: base.res_partner_4
+    partner_invoice_id: base.res_partner_address_7
+    partner_order_id: base.res_partner_address_7
+    partner_shipping_id: base.res_partner_address_7
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+-
+  I confirm the sale order
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so11}
+-
+  I verify that margin field gets bind with the value
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so11"))
+    assert so.margin, "No margin !" 
+-
+  I verify that the picking has been generated for the sale order
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so11"))
+    assert so.picking_ids,"Picking has not been generated"
+-
+  Then I click on the 'Create Invoice' button of 'Outgoing Orders'
+-
+  !python {model: stock.picking}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so11"))
+    ids = self.search(cr, uid, [('origin', '=', so.name),('type', '=', 'out')])
+    self.create_invoice(cr, uid, ids, {"lang": "en_US", "search_default_available":
+      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
+      "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
+      })
+-
+  I verify that an invoice has been generated from picking
+-
+  !python {model: stock.picking}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so11"))
+    pick_ids = self.search(cr, uid, [('origin', '=', so.name)])
+    pick_brw = self.browse(cr, uid, pick_ids[0])
+    assert pick_brw.invoice_ids,"Invoice has not been created"
+    

addons/sale_mrp/i18n/et.po

@@ -0,0 +1,73 @@
+# Estonian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-06-28 09:21+0000\n"
+"PO-Revision-Date: 2010-08-05 08:10+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-06 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+"    This module provides facility to the user to install mrp and sale "
+"modules\n"
+"    at a time. It is basically used when we want to keep track of "
+"production\n"
+"    orders generated from sale orders.\n"
+"    It adds sale name and sale Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""