From 1dceb70f3bf281f44cc746263a9a00a0fb6de2d8 Mon Sep 17 00:00:00 2001 From: Rifakat Date: Thu, 13 Jun 2013 15:13:30 +0530 Subject: [PATCH 1/4] [FIX] account: if tax is , total base is applied only on the main tax and does not carry the child tax amount into base, it is compulsory to add child tax amount to tax base becuase the next tax i.e. VAT is applied on total tax base amount --- addons/account/account.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index c2e75e889f0..418a4f7b161 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2088,12 +2088,15 @@ class account_tax(osv.osv): data['balance'] = cur_price_unit amount2 = data.get('amount', 0.0) + amount3 = 0.0 if tax.child_ids: if tax.child_depend: latest = res.pop() amount = amount2 child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity) res.extend(child_tax) + for child in child_tax: + amount3 += child.get('amount', 0.0) if tax.child_depend: for r in res: for name in ('base','ref_base'): @@ -2109,7 +2112,7 @@ class account_tax(osv.osv): r['amount'] = data['amount'] latest[name+'_code_id'] = False if tax.include_base_amount: - cur_price_unit+=amount2 + cur_price_unit += amount2 + amount3 return res def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False): From 10db161454340cc070f65a919f2fb3fe9e465639 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 15 May 2014 06:10:52 +0000 Subject: [PATCH 2/4] Launchpad automatic translations update. --- addons/project_issue/i18n/mn.po | 4 ++-- addons/stock/i18n/nl.po | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po index badabe240d0..1436ef3b2d9 100644 --- a/addons/project_issue/i18n/mn.po +++ b/addons/project_issue/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n" -"X-Generator: Launchpad (build 17002)\n" +"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n" +"X-Generator: Launchpad (build 17007)\n" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_03 diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index 3fb1f4079fc..ad5f42d7cfa 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-05-13 13:54+0000\n" +"PO-Revision-Date: 2014-05-14 18:21+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n" -"X-Generator: Launchpad (build 17002)\n" +"X-Launchpad-Export-Date: 2014-05-15 06:10+0000\n" +"X-Generator: Launchpad (build 17007)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -5128,7 +5128,7 @@ msgstr "Gekoppelde locatiesoort" #: help:stock.picking.in,min_date:0 #: help:stock.picking.out,min_date:0 msgid "Scheduled time for the shipment to be processed" -msgstr "Geplande tijd, wanneer de uitgaande levering wordt verwerkt" +msgstr "Geplande tijd, wanneer de levering wordt verwerkt" #. module: stock #: selection:report.stock.inventory,location_type:0 From e81306704170aeb62aefd716b4bbf511d3eb1f22 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 16 May 2014 06:43:51 +0000 Subject: [PATCH 3/4] Launchpad automatic translations update. --- addons/account_budget/i18n/it.po | 10 +- addons/stock/i18n/hr.po | 240 ++++++++++++------------------- 2 files changed, 100 insertions(+), 150 deletions(-) diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po index 90b54d479cc..babb30b80ae 100644 --- a/addons/account_budget/i18n/it.po +++ b/addons/account_budget/i18n/it.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-05-15 08:00+0000\n" +"Last-Translator: Davide Corio @ LS \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-05-16 06:43+0000\n" +"X-Generator: Launchpad (build 17007)\n" #. module: account_budget #: view:account.budget.analytic:0 @@ -212,7 +212,7 @@ msgstr "Valore Effettivo" #: view:crossovered.budget:0 #: field:crossovered.budget.lines,practical_amount:0 msgid "Practical Amount" -msgstr "Imporo effettivo" +msgstr "Importo effettivo" #. module: account_budget #: field:crossovered.budget,date_to:0 diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po index f387ab46671..191bf94479e 100644 --- a/addons/stock/i18n/hr.po +++ b/addons/stock/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-05-05 09:49+0000\n" +"PO-Revision-Date: 2014-05-15 13:48+0000\n" "Last-Translator: Marko Carevic \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: 2014-05-06 07:27+0000\n" -"X-Generator: Launchpad (build 16996)\n" +"X-Launchpad-Export-Date: 2014-05-16 06:43+0000\n" +"X-Generator: Launchpad (build 17007)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -55,7 +55,7 @@ msgstr "" #. module: stock #: view:stock.picking.out:0 msgid "Confirm & Deliver" -msgstr "Potvrdi i isporuči" +msgstr "Forsiraj dostupnost i isporuči" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity @@ -125,8 +125,8 @@ msgid "Product Moves" msgstr "Product Moves" #. module: stock -#: code:addons/stock/stock.py:2568 -#: code:addons/stock/stock.py:2629 +#: code:addons/stock/stock.py:2519 +#: code:addons/stock/stock.py:2580 #, python-format msgid "Please provide proper quantity." msgstr "Molimo unesite ispravnu količinu" @@ -145,13 +145,13 @@ msgstr "" "Interni broj za slučajeve kada se razlikuje od proizvođačeva serijskog broja" #. module: stock -#: code:addons/stock/wizard/stock_fill_inventory.py:63 +#: code:addons/stock/wizard/stock_fill_inventory.py:59 #, python-format msgid "You cannot perform this operation on more than one Stock Inventories." msgstr "Nije oguće izvršiti ovu operaciju na više od jednog skladišta" #. module: stock -#: code:addons/stock/wizard/stock_change_product_qty.py:95 +#: code:addons/stock/wizard/stock_change_product_qty.py:91 #, python-format msgid "Quantity cannot be negative." msgstr "Količine nemogu biti negativne" @@ -184,8 +184,6 @@ msgstr "npr. godišnja inventura" #: field:stock.partial.move.line,quantity:0 #: field:stock.partial.picking.line,quantity:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: field:stock.report.prodlots,qty:0 #: field:stock.report.tracklots,name:0 #: field:stock.return.picking.memory,quantity:0 @@ -319,7 +317,7 @@ msgid "Reference" msgstr "Vezna oznaka" #. module: stock -#: code:addons/stock/stock.py:1565 +#: code:addons/stock/stock.py:1548 #, python-format msgid "Products to Process" msgstr "Artikli za obradu" @@ -358,12 +356,12 @@ msgstr "" "da bi mogao biti ubačen u kanban pogled." #. module: stock -#: code:addons/stock/stock.py:782 -#: code:addons/stock/stock.py:2517 -#: code:addons/stock/stock.py:2568 -#: code:addons/stock/stock.py:2629 -#: code:addons/stock/wizard/stock_change_product_qty.py:95 -#: code:addons/stock/wizard/stock_fill_inventory.py:128 +#: code:addons/stock/stock.py:768 +#: code:addons/stock/stock.py:2475 +#: code:addons/stock/stock.py:2519 +#: code:addons/stock/stock.py:2580 +#: code:addons/stock/wizard/stock_change_product_qty.py:91 +#: code:addons/stock/wizard/stock_fill_inventory.py:124 #: code:addons/stock/wizard/stock_inventory_merge.py:43 #: code:addons/stock/wizard/stock_inventory_merge.py:63 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96 @@ -371,9 +369,9 @@ msgstr "" #: code:addons/stock/wizard/stock_partial_picking.py:174 #: code:addons/stock/wizard/stock_partial_picking.py:181 #: code:addons/stock/wizard/stock_partial_picking.py:192 -#: code:addons/stock/wizard/stock_return_picking.py:102 -#: code:addons/stock/wizard/stock_return_picking.py:109 -#: code:addons/stock/wizard/stock_return_picking.py:212 +#: code:addons/stock/wizard/stock_return_picking.py:99 +#: code:addons/stock/wizard/stock_return_picking.py:106 +#: code:addons/stock/wizard/stock_return_picking.py:205 #, python-format msgid "Warning!" msgstr "Upozorenje!" @@ -492,9 +490,6 @@ msgstr "" #: selection:stock.move,state:0 #: selection:stock.picking,state:0 #: selection:stock.picking.in,state:0 -#: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: selection:stock.picking.out,state:0 msgid "Waiting Availability" msgstr "Čeka dostupnost" @@ -503,9 +498,6 @@ msgstr "Čeka dostupnost" #: selection:report.stock.inventory,state:0 #: selection:report.stock.move,state:0 #: selection:stock.move,state:0 -#: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: view:stock.production.lot:0 #: field:stock.production.lot,stock_available:0 msgid "Available" @@ -578,7 +570,7 @@ msgstr "" "Ovo vrijeme jamčite kupcu kao rok isporuke." #. module: stock -#: code:addons/stock/product.py:195 +#: code:addons/stock/product.py:196 #, python-format msgid "Products: " msgstr "Proizvodi: " @@ -595,7 +587,7 @@ msgid "Draft Physical Inventories" msgstr "Nacrti fizičkih inventura" #. module: stock -#: code:addons/stock/stock.py:1806 +#: code:addons/stock/stock.py:1777 #, python-format msgid "" "Quantities, Units of Measure, Products and Locations cannot be modified on " @@ -643,7 +635,7 @@ msgid "Item Labels" msgstr "Labela" #. module: stock -#: code:addons/stock/stock.py:1373 +#: code:addons/stock/stock.py:1356 #, python-format msgid "Back order %s has been created." msgstr "" @@ -724,8 +716,6 @@ msgstr "Količina za serijski broj %d %s je veća od dostupne količine (%d)!" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Order(Origin)" msgstr "Nalog(Izvor)" @@ -765,7 +755,6 @@ msgid "Destination Address " msgstr "Odredišna adresa " #. module: stock -#: view:product.product:0 #: field:product.product,reception_count:0 msgid "Reception" msgstr "Zaprimanje" @@ -816,8 +805,6 @@ msgstr "Planirana godina" #: view:stock.picking.in:0 #: field:stock.picking.in,state:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: field:stock.picking.out,state:0 msgid "Status" msgstr "Status" @@ -915,7 +902,7 @@ msgstr "" "which entries will be automatically posted when stock moves are processed." #. module: stock -#: code:addons/stock/stock.py:2296 +#: code:addons/stock/stock.py:2252 #, python-format msgid "" "Please define stock output account for this product or its category: \"%s\" " @@ -943,7 +930,7 @@ msgid "Reference must be unique per Company!" msgstr "Oznaka mora biti jedinstvena unuar organizacije" #. module: stock -#: code:addons/stock/product.py:448 +#: code:addons/stock/product.py:447 #, python-format msgid "Future Receptions" msgstr "Budući prijemi" @@ -982,8 +969,6 @@ msgstr "- ažuriraj" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Weight" msgstr "Težina" @@ -1027,7 +1012,7 @@ msgid "December" msgstr "Prosinac" #. module: stock -#: code:addons/stock/stock.py:1204 +#: code:addons/stock/stock.py:1190 #, python-format msgid "" "You cannot cancel the picking as some moves have been done. You should " @@ -1052,7 +1037,7 @@ msgid "Change Product Quantity" msgstr "Promjeni količinu proizvoda" #. module: stock -#: code:addons/stock/product.py:464 +#: code:addons/stock/product.py:463 #, python-format msgid "Future P&L" msgstr "Budući P&L" @@ -1089,7 +1074,7 @@ msgid "You must assign a serial number for this product." msgstr "Morate dodijeliti serijski broj za ovaj proizvod" #. module: stock -#: code:addons/stock/stock.py:2299 +#: code:addons/stock/stock.py:2255 #, python-format msgid "Please define journal on the product category: \"%s\" (id: %d)" msgstr "Definirajte dnevnik za kategoriju proizvoda: \"%s\" (id: %d)" @@ -1136,8 +1121,6 @@ msgstr "Valuta" #: view:stock.picking:0 #: view:stock.picking.in:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Journal" msgstr "Dnevnik" @@ -1216,7 +1199,7 @@ msgid "" msgstr "Molim izaberite višestruke fizičke zalihe za spajanje u popis." #. module: stock -#: code:addons/stock/wizard/stock_return_picking.py:109 +#: code:addons/stock/wizard/stock_return_picking.py:106 #, python-format msgid "" "No products to return (only lines in Done state and not fully returned yet " @@ -1345,7 +1328,7 @@ msgid "Author" msgstr "Autor" #. module: stock -#: code:addons/stock/stock.py:1851 +#: code:addons/stock/stock.py:1822 #, python-format msgid "" "You are moving %.2f %s but only %.2f %s available for this serial number." @@ -1353,8 +1336,6 @@ msgstr "" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Internal Shipment :" msgstr "Interni prijenosi:" @@ -1382,7 +1363,7 @@ msgid "Supplier" msgstr "Dobavljač" #. module: stock -#: code:addons/stock/stock.py:2908 +#: code:addons/stock/stock.py:2859 #, python-format msgid "" "In order to cancel this inventory, you must first unpost related journal " @@ -1493,8 +1474,6 @@ msgstr "Skl. prijenos utroška" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Delivery Order :" msgstr "Otpremnica" @@ -1588,7 +1567,7 @@ msgstr "" "otpremnice koja utječe na prosječnu cijenu proizvoda." #. module: stock -#: code:addons/stock/stock.py:1919 +#: code:addons/stock/stock.py:1890 #, python-format msgid "Warning: No Back Order" msgstr "" @@ -1610,13 +1589,13 @@ msgid "To be refunded/invoiced" msgstr "Kreiraj fakturu" #. module: stock -#: code:addons/stock/stock.py:2492 +#: code:addons/stock/stock.py:2450 #, python-format msgid "You can only delete draft moves." msgstr "Možete izbrisati samo transakcije u nacrtu." #. module: stock -#: code:addons/stock/stock.py:1682 +#: code:addons/stock/stock.py:1665 #, python-format msgid "You cannot move product %s to a location of type view %s." msgstr "" @@ -1655,7 +1634,7 @@ msgid "Additional Info" msgstr "Dodatni podaci" #. module: stock -#: code:addons/stock/stock.py:2697 +#: code:addons/stock/stock.py:2648 #, python-format msgid "Missing partial picking data for move #%s." msgstr "" @@ -1671,7 +1650,7 @@ msgid "Incoming Shipments already processed" msgstr "Dolazne počiljke su već obrađene" #. module: stock -#: code:addons/stock/wizard/stock_return_picking.py:102 +#: code:addons/stock/wizard/stock_return_picking.py:99 #, python-format msgid "You may only return pickings that are Confirmed, Available or Done!" msgstr "" @@ -1748,9 +1727,6 @@ msgstr "" #. module: stock #: field:stock.inventory,date:0 #: field:stock.move,create_date:0 -#: field:stock.picking,date:0 -#: field:stock.picking.in,date:0 -#: field:stock.picking.out,date:0 #: field:stock.production.lot,date:0 #: field:stock.tracking,date:0 msgid "Creation Date" @@ -1840,7 +1816,7 @@ msgid "Order Date" msgstr "Datum naloga" #. module: stock -#: code:addons/stock/wizard/stock_change_product_qty.py:96 +#: code:addons/stock/wizard/stock_change_product_qty.py:92 #, python-format msgid "INV: %s" msgstr "INV: %s" @@ -1878,7 +1854,7 @@ msgid "Stock Invoice Onshipping" msgstr "Račun nakon isporuke" #. module: stock -#: code:addons/stock/stock.py:2517 +#: code:addons/stock/stock.py:2475 #, python-format msgid "Please provide a positive quantity to scrap." msgstr "" @@ -1943,8 +1919,6 @@ msgstr "Zaostala narudžba" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Incoming Shipment :" msgstr "Primka" @@ -2030,7 +2004,7 @@ msgid "Shelf 2" msgstr "Shelf 2" #. module: stock -#: code:addons/stock/stock.py:543 +#: code:addons/stock/stock.py:529 #, python-format msgid "You cannot remove a lot line." msgstr "" @@ -2054,7 +2028,7 @@ msgid "Localization" msgstr "Lokacija" #. module: stock -#: code:addons/stock/product.py:460 +#: code:addons/stock/product.py:459 #, python-format msgid "Delivered Qty" msgstr "Otpremljena kol." @@ -2373,7 +2347,7 @@ msgid "Generate accounting entries per stock movement" msgstr "" #. module: stock -#: code:addons/stock/product.py:450 +#: code:addons/stock/product.py:449 #, python-format msgid "Received Qty" msgstr "Zaprimljena kol." @@ -2413,8 +2387,6 @@ msgstr "Naziv" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Supplier Address :" msgstr "Adresa dobavljača :" @@ -2449,8 +2421,8 @@ msgid "Customer Locations" msgstr "Lokacije kupca" #. module: stock -#: code:addons/stock/stock.py:2492 -#: code:addons/stock/stock.py:2907 +#: code:addons/stock/stock.py:2449 +#: code:addons/stock/stock.py:2858 #, python-format msgid "User Error!" msgstr "Greška korisnika!" @@ -2681,7 +2653,7 @@ msgid "Warehouse board" msgstr "Kokpit skladišta" #. module: stock -#: code:addons/stock/product.py:470 +#: code:addons/stock/product.py:469 #, python-format msgid "Future Qty" msgstr "Buduće kol." @@ -2747,7 +2719,7 @@ msgid "Products" msgstr "Proizvodi" #. module: stock -#: code:addons/stock/stock.py:2287 +#: code:addons/stock/stock.py:2243 #, python-format msgid "" "Cannot create Journal Entry, Output Account of this product and Valuation " @@ -2787,7 +2759,7 @@ msgid "Outgoing Products" msgstr "Izlazni proizvodi" #. module: stock -#: code:addons/stock/stock.py:2293 +#: code:addons/stock/stock.py:2249 #, python-format msgid "" "Please define stock input account for this product or its category: \"%s\" " @@ -2809,7 +2781,7 @@ msgid "Move" msgstr "Temeljnica" #. module: stock -#: code:addons/stock/product.py:466 +#: code:addons/stock/product.py:465 #, python-format msgid "P&L Qty" msgstr "P&L kol." @@ -2904,8 +2876,6 @@ msgstr "Izvor" #: field:stock.picking,location_id:0 #: field:stock.picking.in,location_id:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: field:stock.picking.out,location_id:0 #: field:stock.report.prodlots,location_id:0 #: field:stock.report.tracklots,location_id:0 @@ -2929,7 +2899,7 @@ msgid "Cancel Move" msgstr "Otkaži prijenos" #. module: stock -#: code:addons/stock/stock.py:2290 +#: code:addons/stock/stock.py:2246 #, python-format msgid "" "Cannot create Journal Entry, Input Account of this product and Valuation " @@ -2953,7 +2923,7 @@ msgid "scrap" msgstr "otpis" #. module: stock -#: code:addons/stock/stock.py:1920 +#: code:addons/stock/stock.py:1891 #, python-format msgid "" "By changing the quantity here, you accept the new quantity as complete: " @@ -3045,13 +3015,13 @@ msgid "Stock Journal" msgstr "Dnevnik zalihe" #. module: stock -#: code:addons/stock/wizard/stock_return_picking.py:176 +#: code:addons/stock/wizard/stock_return_picking.py:171 #, python-format msgid "%s-%s-return" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_change_product_qty.py:86 +#: code:addons/stock/wizard/stock_change_product_qty.py:82 #, python-format msgid "Active ID is not set in Context" msgstr "Aktivni ID nije u kontekstu" @@ -3074,7 +3044,7 @@ msgid "Scrap Move" msgstr "" #. module: stock -#: help:stock.move,prodlot_id:0 +#: help:stock.move,lot_id:0 msgid "Serial number is used to put a serial number on the production" msgstr "" @@ -3119,7 +3089,7 @@ msgid "Date of Completion" msgstr "Datum izvršenja" #. module: stock -#: code:addons/stock/stock.py:1680 +#: code:addons/stock/stock.py:1663 #, python-format msgid "You cannot move product %s from a location of type view %s." msgstr "" @@ -3206,10 +3176,8 @@ msgstr "Datum revizije" #. module: stock #: view:report.stock.inventory:0 -#: field:report.stock.inventory,prodlot_id:0 +#: field:report.stock.inventory,lot_id:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Lot" msgstr "Lot" @@ -3238,8 +3206,6 @@ msgstr "Postavi raspoloživo" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Contact Address :" msgstr "Kontakt adresa :" @@ -3431,7 +3397,7 @@ msgid "" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2545 +#: code:addons/stock/stock.py:2496 #, python-format msgid "%s %s %s has been moved to scrap." msgstr "" @@ -3450,9 +3416,6 @@ msgstr "Customers Packings" #: selection:stock.move,state:0 #: view:stock.picking:0 #: view:stock.picking.in:0 -#: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Done" msgstr "Izvršeno" @@ -3481,7 +3444,7 @@ msgid "Date done" msgstr "Datum izvršenja" #. module: stock -#: code:addons/stock/stock.py:1135 +#: code:addons/stock/stock.py:1121 #, python-format msgid "" "Please put a partner on the picking list if you want to generate invoice." @@ -3556,7 +3519,7 @@ msgid "Stock" msgstr "Zaliha" #. module: stock -#: code:addons/stock/wizard/stock_return_picking.py:226 +#: code:addons/stock/wizard/stock_return_picking.py:219 #, python-format msgid "Returned Picking" msgstr "" @@ -3634,7 +3597,7 @@ msgid "Assigned Internal Moves" msgstr "DOdjeljeni interni prijenosi" #. module: stock -#: code:addons/stock/stock.py:804 +#: code:addons/stock/stock.py:790 #, python-format msgid "You cannot process picking without stock moves." msgstr "Prijenosi za ovaj serijski broj" @@ -3883,7 +3846,7 @@ msgid "Inventory Move" msgstr "Skladišni prijenos" #. module: stock -#: code:addons/stock/product.py:476 +#: code:addons/stock/product.py:475 #, python-format msgid "Future Productions" msgstr "Buduća proizvodnja" @@ -4006,24 +3969,21 @@ msgstr "Inventar lotova" #: model:ir.model,name:stock.model_stock_production_lot #: model:ir.ui.menu,name:stock.menu_action_production_lot_form #: model:res.request.link,name:stock.req_link_tracking -#: field:stock.change.product.qty,prodlot_id:0 +#: field:stock.change.product.qty,lot_id:0 #: field:stock.inventory.line,prod_lot_id:0 #: field:stock.inventory.line.split.lines,name:0 -#: field:stock.inventory.line.split.lines,prodlot_id:0 -#: field:stock.move,prodlot_id:0 +#: field:stock.inventory.line.split.lines,lot_id:0 +#: field:stock.move,lot_id:0 #: view:stock.move.split:0 #: field:stock.move.split.lines,name:0 -#: field:stock.move.split.lines,prodlot_id:0 -#: field:stock.partial.move.line,prodlot_id:0 -#: field:stock.partial.picking.line,prodlot_id:0 +#: field:stock.move.split.lines,lot_id:0 +#: field:stock.partial.move.line,lot_id:0 +#: field:stock.partial.picking.line,lot_id:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: view:stock.production.lot:0 #: field:stock.production.lot,name:0 #: field:stock.production.lot.revision,lot_id:0 -#: field:stock.report.prodlots,prodlot_id:0 -#: field:stock.return.picking.memory,prodlot_id:0 +#: field:stock.report.prodlots,lot_id:0 msgid "Serial Number" msgstr "Serijski broj" @@ -4082,7 +4042,7 @@ msgid "Non European Customers" msgstr "Klijenti izvan Europe" #. module: stock -#: code:addons/stock/product.py:100 +#: code:addons/stock/product.py:96 #: code:addons/stock/product.py:110 #: code:addons/stock/product.py:113 #: code:addons/stock/product.py:120 @@ -4090,19 +4050,18 @@ msgstr "Klijenti izvan Europe" #: code:addons/stock/product.py:167 #: code:addons/stock/report/report_stock.py:78 #: code:addons/stock/report/report_stock.py:134 -#: code:addons/stock/stock.py:543 -#: code:addons/stock/stock.py:804 -#: code:addons/stock/stock.py:1204 -#: code:addons/stock/stock.py:1213 -#: code:addons/stock/stock.py:2287 -#: code:addons/stock/stock.py:2290 -#: code:addons/stock/stock.py:2293 -#: code:addons/stock/stock.py:2296 -#: code:addons/stock/stock.py:2299 -#: code:addons/stock/stock.py:2302 -#: code:addons/stock/stock.py:2525 -#: code:addons/stock/stock.py:2634 -#: code:addons/stock/wizard/stock_fill_inventory.py:63 +#: code:addons/stock/stock.py:529 +#: code:addons/stock/stock.py:790 +#: code:addons/stock/stock.py:1190 +#: code:addons/stock/stock.py:1199 +#: code:addons/stock/stock.py:2243 +#: code:addons/stock/stock.py:2246 +#: code:addons/stock/stock.py:2249 +#: code:addons/stock/stock.py:2252 +#: code:addons/stock/stock.py:2255 +#: code:addons/stock/stock.py:2258 +#: code:addons/stock/stock.py:2585 +#: code:addons/stock/wizard/stock_fill_inventory.py:59 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112 #: code:addons/stock/wizard/stock_splitinto.py:53 #, python-format @@ -4199,7 +4158,7 @@ msgstr "" "je fiksna." #. module: stock -#: code:addons/stock/stock.py:1882 +#: code:addons/stock/stock.py:1853 #, python-format msgid "" "By changing this quantity here, you accept the new quantity as complete: " @@ -4269,7 +4228,7 @@ msgid "Followers" msgstr "Pratitelji" #. module: stock -#: code:addons/stock/stock.py:2634 +#: code:addons/stock/stock.py:2585 #, python-format msgid "Cannot consume a move with negative or zero quantity." msgstr "" @@ -4355,7 +4314,7 @@ msgstr "" "stock input account will be debited." #. module: stock -#: code:addons/stock/stock.py:2860 +#: code:addons/stock/stock.py:2811 #, python-format msgid "INV:" msgstr "" @@ -4374,7 +4333,7 @@ msgid "Chaining Journal" msgstr "Dnevnik ulančavanja" #. module: stock -#: code:addons/stock/stock.py:782 +#: code:addons/stock/stock.py:768 #, python-format msgid "Not enough stock, unable to reserve the products." msgstr "Nedovoljna količina na zalihi, rezervacija artikla nije moguća." @@ -4406,7 +4365,7 @@ msgid "" msgstr "" #. module: stock -#: code:addons/stock/product.py:458 +#: code:addons/stock/product.py:457 #, python-format msgid "Future Deliveries" msgstr "Buduće otpreme" @@ -4429,7 +4388,7 @@ msgid "Auto Validate" msgstr "Automatska potvrda" #. module: stock -#: code:addons/stock/stock.py:1850 +#: code:addons/stock/stock.py:1821 #, python-format msgid "Insufficient Stock for Serial Number !" msgstr "" @@ -4526,14 +4485,14 @@ msgid "Invoiced" msgstr "Fakturirano" #. module: stock -#: code:addons/stock/stock.py:1881 +#: code:addons/stock/stock.py:1852 #: view:product.template:0 #, python-format msgid "Information" msgstr "Informacija" #. module: stock -#: code:addons/stock/stock.py:1213 +#: code:addons/stock/stock.py:1199 #, python-format msgid "You cannot remove the picking which is in %s state!" msgstr "Nije moguće ukloniti pošiljku koja je u statusu %s !" @@ -4569,8 +4528,6 @@ msgstr "Auto-skladišnica" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Customer Address :" msgstr "Adresa kupca:" @@ -4637,7 +4594,7 @@ msgid "Shelves (Y)" msgstr "Police (Y)" #. module: stock -#: code:addons/stock/stock.py:2302 +#: code:addons/stock/stock.py:2258 #, python-format msgid "" "Please define inventory valuation account on the product category: \"%s\" " @@ -4650,7 +4607,7 @@ msgid "Serial Number Revision" msgstr "" #. module: stock -#: code:addons/stock/product.py:100 +#: code:addons/stock/product.py:96 #, python-format msgid "Specify valuation Account for Product Category: %s." msgstr "" @@ -4663,7 +4620,7 @@ msgid "" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_return_picking.py:212 +#: code:addons/stock/wizard/stock_return_picking.py:205 #, python-format msgid "Please specify at least one non-zero quantity." msgstr "" @@ -4696,7 +4653,7 @@ msgid "November" msgstr "Studeni" #. module: stock -#: code:addons/stock/product.py:472 +#: code:addons/stock/product.py:471 #, python-format msgid "Unplanned Qty" msgstr "Neplanirana kol." @@ -4707,7 +4664,7 @@ msgid "Chained Company" msgstr "Chained Company" #. module: stock -#: view:stock.picking:0 +#: view:stock.picking.out:0 msgid "Check Availability" msgstr "Provjeri dostupnost" @@ -4732,7 +4689,7 @@ msgid "" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_fill_inventory.py:128 +#: code:addons/stock/wizard/stock_fill_inventory.py:124 #, python-format msgid "" "No product in this location. Please select a location in the product form." @@ -4749,14 +4706,14 @@ msgid "Move History (parent moves)" msgstr "Move History (parent moves)" #. module: stock -#: code:addons/stock/product.py:454 +#: code:addons/stock/product.py:453 #, python-format msgid "Future Stock" msgstr "Buduća zaliha" #. module: stock -#: code:addons/stock/stock.py:1680 -#: code:addons/stock/stock.py:1682 +#: code:addons/stock/stock.py:1663 +#: code:addons/stock/stock.py:1665 #, python-format msgid "Error" msgstr "Greška" @@ -4879,8 +4836,6 @@ msgstr "Kašnjenja" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Schedule Date" msgstr "Zakazani datum" @@ -4918,8 +4873,6 @@ msgstr "Realan" #. module: stock #: field:stock.move,name:0 #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 #: view:stock.production.lot.revision:0 #: field:stock.production.lot.revision,description:0 msgid "Description" @@ -4943,7 +4896,6 @@ msgid "Deliver" msgstr "Otpremi" #. module: stock -#: view:product.product:0 #: field:product.product,delivery_count:0 msgid "Delivery" msgstr "Otprema" @@ -4965,7 +4917,7 @@ msgid "Location Content" msgstr "Location Content" #. module: stock -#: code:addons/stock/product.py:478 +#: code:addons/stock/product.py:477 #, python-format msgid "Produced Qty" msgstr "Proizvedena kol." @@ -5172,8 +5124,6 @@ msgstr "Spremno za isporuku" #. module: stock #: report:stock.picking.list:0 -#: report:stock.picking.list.in:0 -#: report:stock.picking.list.out:0 msgid "Warehouse Address :" msgstr "Adresa skladišta:" From 97fd0d8ed8feeed5353306a50234416ca784e05a Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 16 May 2014 13:01:34 +0200 Subject: [PATCH 4/4] [FIX] auth_oauth: Replace OpenERP.com provider by Odoo.com provider --- addons/auth_oauth/auth_oauth_data.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml index 983549f9378..3889cf2d883 100644 --- a/addons/auth_oauth/auth_oauth_data.xml +++ b/addons/auth_oauth/auth_oauth_data.xml @@ -2,13 +2,13 @@ - OpenERP.com Accounts - https://accounts.openerp.com/oauth2/auth + Odoo.com Accounts + https://accounts.odoo.com/oauth2/auth userinfo - https://accounts.openerp.com/oauth2/tokeninfo + https://accounts.odoo.com/oauth2/tokeninfo zocial openerp - Log in with OpenERP.com + Log in with Odoo.com