[MERGE] branch merged with lp:openobject-addons

bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4

23 files changed, 802 insertions, 232 deletions

diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index e5317cd8a94..d2f91c6f040 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -22,6 +22,7 @@
 {
     "name": "Lunch Module",
     "author": "OpenERP SA",
+    'complexity': "easy",
     "Description": """
     The lunch module is for keeping a record of the order placed and payment of the orders.
     =======================================================================================
@@ -49,6 +50,7 @@
         'lunch_view.xml',
         'lunch_report.xml',
         'report/report_lunch_order_view.xml',
+        'lunch_installer_view.xml'
     ],
     "demo_xml": ['lunch_demo.xml'],
     "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
diff --git a/addons/lunch/i18n/bg.po b/addons/lunch/i18n/bg.po
index 8139796a161..9f42d759892 100644
--- a/addons/lunch/i18n/bg.po
+++ b/addons/lunch/i18n/bg.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/ca.po b/addons/lunch/i18n/ca.po
index 39b47a968f4..57525dacee0 100644
--- a/addons/lunch/i18n/ca.po
+++ b/addons/lunch/i18n/ca.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/cs.po b/addons/lunch/i18n/cs.po
new file mode 100644
index 00000000000..e5199f321f2
--- /dev/null
+++ b/addons/lunch/i18n/cs.po
@@ -0,0 +1,547 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* lunch
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-09-05 06:39+0000\n"
+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
+"Language-Team: Czech <cs@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: 2011-09-06 04:40+0000\n"
+"X-Generator: Launchpad (build 13861)\n"
+"X-Poedit-Language: Czech\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr "Nulovat pokladnu"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "Obědnávky obědů"
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "Jste si jisti, že chcete zrušit tuto objednávku ?"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "Pohyby hotovosti"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Seskupit podle..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "potvrdit objednávku"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 dnů    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+"\n"
+"    Základní modul pro správu obědů\n"
+"\n"
+"   udržuje přehled o Obědnávkách obědů, Pohybech hotovosti, Pokladně, "
+"Výrobcích.\n"
+"    Používá různé kategorie pro výrobky.\n"
+"    "
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "Dnes"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Březen"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Celkem :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Den"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr "Zrušit objednávku"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Částka"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Výrobky"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "Množství dostupné podle uživatele a balení"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Měsíc   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Statistika obědnávek obědů"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "PohybyHotovosti"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Potvrzeno"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr "Modul obědů"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Hledat obědnávku obědu"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Stav"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr "Množství balení podle uživatele"
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Datum vytvoření"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Jméno/Datum"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Popis objednávky"
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr "Potvrdit objednávku"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Červenec"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr "Krabice"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 dní  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Měsíc-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Datum vytvoření"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Kategorie výrobku "
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr "Nastavit na nulu"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "Pohyb hotovosti"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr "Duben"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr "Září"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr "Prosinec"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Měsíc"
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr "Jméno balení"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr "Ano"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Kategorie"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Rok  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Kategorie výrobku"
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr "Ne"
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr "Potvrzení objednávek"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr "Jste si jisti, že chcete nulovat tuto pokladnu ?"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr "Koncept"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Srpen"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Analýza objednávek obědu"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Červen"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr "Uživatelské jméno"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Analýza prodeje"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr "Oběd"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr "Uživatel"
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr "Listopad"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Říjen"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Leden"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr "vyčistit pokladna"
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr "Aktivní"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Datum objednávky"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr "Pokladna pro obědy "
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr "Nastavit pokladnu na nulu"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "Jméno balení"
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr "Zrušit"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " Pokladny "
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr "Cena za kus"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Výrobek"
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Popis"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Květen"
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr "Hledat PohybyHotovosti"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "Celkem balení"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Výrobek obědu"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Celkem zbývajících"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "Celková cena"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Únor"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr "Jméno"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Celková částka"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr "Kategorie vztažená k výrobkům"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "Pokladny"
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr "Objednávka"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Obědnávka obědu"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr "Pozice hotovosti podle uživatele"
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Správce"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 dní   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr "K potvrzení"
+
+#. module: lunch
+#: field:report.lunch.amount,year:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "Rok"
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 1d812d99365..3752094163d 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -555,12 +555,6 @@ msgstr "Jahr"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Total:"
-#~ msgstr "Gesamt:"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index a4d9077d2ae..0b8220a1773 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -546,3 +546,15 @@ msgstr "Para confirmar"
 #: field:report.lunch.order,year:0
 msgid "Year"
 msgstr "Año"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre del modelo inválido en la definición de acción."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/lunch/i18n/es_PY.po b/addons/lunch/i18n/es_PY.po
index 536d4e9cfdf..847d6f9e73e 100644
--- a/addons/lunch/i18n/es_PY.po
+++ b/addons/lunch/i18n/es_PY.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/fi.po b/addons/lunch/i18n/fi.po
index c272d755193..4d6debc8679 100644
--- a/addons/lunch/i18n/fi.po
+++ b/addons/lunch/i18n/fi.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index fffcc9bddb5..f9323bc1575 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -549,12 +549,6 @@ msgstr "Année"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de modèle incorrect dans la définition de l'action"
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat du module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML incorrect dans l'architecture de la vue !"
 
@@ -563,9 +557,3 @@ msgstr "Année"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer par x_ et ne doit contenir aucun caractère "
 #~ "spécial !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille d'un champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
diff --git a/addons/lunch/i18n/gl.po b/addons/lunch/i18n/gl.po
index 6209bd5b64f..05ee853ca6c 100644
--- a/addons/lunch/i18n/gl.po
+++ b/addons/lunch/i18n/gl.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/hu.po b/addons/lunch/i18n/hu.po
index dbed810b7de..c1dd1761966 100644
--- a/addons/lunch/i18n/hu.po
+++ b/addons/lunch/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-31 13:51+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/it.po b/addons/lunch/i18n/it.po
index 528dd882cc3..b4924856131 100644
--- a/addons/lunch/i18n/it.po
+++ b/addons/lunch/i18n/it.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/pt.po b/addons/lunch/i18n/pt.po
index ce76edb3623..b5f371269f9 100644
--- a/addons/lunch/i18n/pt.po
+++ b/addons/lunch/i18n/pt.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
@@ -542,20 +542,11 @@ msgstr "Ano"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da ação"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo tem de ser único!"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitetura da vista"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro! Não pode criar menus recursivamente."
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
 #~ "especial !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser inferior a 1!"
diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po
index 2e653ad2ec9..e3125b9ca12 100644
--- a/addons/lunch/i18n/pt_BR.po
+++ b/addons/lunch/i18n/pt_BR.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po
index fcd4dd55884..a2973a55263 100644
--- a/addons/lunch/i18n/ru.po
+++ b/addons/lunch/i18n/ru.po
@@ -14,30 +14,30 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Reset cashbox"
-msgstr ""
+msgstr "Сброс кассы"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
 msgid "Lunch Orders"
-msgstr ""
+msgstr "Заказы на ланч"
 
 #. module: lunch
 #: wizard_view:lunch.order.cancel,init:0
 msgid "Are you sure you want to cancel this order ?"
-msgstr ""
+msgstr "Вы уверены, что хотите отменить этот заказ?"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
 msgid "Cash Moves"
-msgstr ""
+msgstr "Движение средств"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -45,17 +45,17 @@ msgstr ""
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_confirm
 msgid "confirm Order"
-msgstr ""
+msgstr "Подтвердить заказ"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 дней    "
 
 #. module: lunch
 #: model:ir.module.module,description:lunch.module_meta_information
@@ -67,409 +67,415 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Базовый модуль управления ланчами\n"
+"\n"
+"    Отслеживание заказов, движения средств, кассы, продукции.\n"
+"    Возможность разнесения продукции по категориям.\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:lunch.order:0
 msgid "Today"
-msgstr ""
+msgstr "Сегодня"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: lunch
 #: report:lunch.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Итого:"
 
 #. module: lunch
 #: field:report.lunch.amount,day:0
 #: view:report.lunch.order:0
 #: field:report.lunch.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.wizard_id_cancel
 #: wizard_view:lunch.order.cancel,init:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Отменить заказ"
 
 #. module: lunch
 #: field:lunch.cashmove,amount:0
 #: field:report.lunch.amount,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_product_form
 #: view:lunch.product:0
 msgid "Products"
-msgstr ""
+msgstr "Продукция"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_amount
 msgid "Amount available by user and box"
-msgstr ""
+msgstr "Доступные суммы по пользователям и кассам"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order
 msgid "Lunch Orders Statistics"
-msgstr ""
+msgstr "Статистика заказа ланчей"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 #: view:lunch.cashmove:0
 #: field:lunch.order,cashmove:0
 msgid "CashMove"
-msgstr ""
+msgstr "Движение Средств"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Подтверждено"
 
 #. module: lunch
 #: view:lunch.order.confirm:0
 msgid "Confirm"
-msgstr ""
+msgstr "Подтвердить"
 
 #. module: lunch
 #: model:ir.module.module,shortdesc:lunch.module_meta_information
 msgid "Lunch Module"
-msgstr ""
+msgstr "Модуль Ланч"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Search Lunch Order"
-msgstr ""
+msgstr "Поиск заказа"
 
 #. module: lunch
 #: field:lunch.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: lunch
 #: field:report.lunch.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Итоговая цена"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 #: view:report.lunch.amount:0
 msgid "Box Amount by User"
-msgstr ""
+msgstr "Сумма в кассе по пользователям"
 
 #. module: lunch
 #: field:lunch.cashmove,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: lunch
 #: report:lunch.order:0
 msgid "Name/Date"
-msgstr ""
+msgstr "Название/Дата"
 
 #. module: lunch
 #: field:lunch.order,descript:0
 msgid "Description Order"
-msgstr ""
+msgstr "Описание заказа"
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.lunch_order_confirm
 #: wizard_button:lunch.order.confirm,init,go:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Подтвердить заказ"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Box"
-msgstr ""
+msgstr "Касса"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 Дней  "
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: lunch
 #: field:report.lunch.amount,date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_category_form
 msgid " Product Categories "
-msgstr ""
+msgstr " Категории продукции "
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,zero:0
 msgid "Set to Zero"
-msgstr ""
+msgstr "Обнулить"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
 msgid "Cash Move"
-msgstr ""
+msgstr "Движение средств"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: lunch
 #: field:report.lunch.amount,month:0
 #: view:report.lunch.order:0
 #: field:report.lunch.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: lunch
 #: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
 msgid "Name of box"
-msgstr ""
+msgstr "Название кассы"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,cancel:0
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_category
 #: view:lunch.category:0
 #: field:lunch.product,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Категория"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Год  "
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_category_form
 msgid "Product Categories"
-msgstr ""
+msgstr "Категории продукции"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,end:0
 msgid "No"
-msgstr ""
+msgstr "Нет"
 
 #. module: lunch
 #: wizard_view:lunch.order.confirm,init:0
 msgid "Orders Confirmation"
-msgstr ""
+msgstr "Подтверждение заказов"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Are you sure you want to reset this cashbox ?"
-msgstr ""
+msgstr "Вы уверены, что хотите сбросить состояние кассы?"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
 #: view:report.lunch.order:0
 msgid "Lunch Order Analysis"
-msgstr ""
+msgstr "Анализ заказов"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: lunch
 #: field:lunch.cashmove,user_cashmove:0
 #: field:lunch.order,user_id:0
 #: field:report.lunch.amount,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Анализ продаж"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch
 msgid "Lunch"
-msgstr ""
+msgstr "Ланч"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:report.lunch.order:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: lunch
 #: field:lunch.order,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox_clean
 msgid "clean cashbox"
-msgstr ""
+msgstr "очистить кассу"
 
 #. module: lunch
 #: field:lunch.cashmove,active:0
 #: field:lunch.product,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: lunch
 #: field:report.lunch.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox
 msgid "Cashbox for Lunch "
-msgstr ""
+msgstr "Касса на ланч "
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
 msgid "Set CashBox to Zero"
-msgstr ""
+msgstr "Обнулить кассу"
 
 #. module: lunch
 #: field:lunch.cashmove,box:0
 #: field:report.lunch.amount,box:0
 msgid "Box Name"
-msgstr ""
+msgstr "Наименование кассы"
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,end:0
 #: wizard_button:lunch.order.confirm,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
 msgid " Cashboxes "
-msgstr ""
+msgstr " Кассы "
 
 #. module: lunch
 #: rml:lunch.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Цена единицы"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_form
 #: field:lunch.order,product:0
 msgid "Product"
-msgstr ""
+msgstr "Продукция"
 
 #. module: lunch
 #: rml:lunch.order:0
 #: field:lunch.product,description:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: lunch
 #: field:lunch.order,price:0
 #: field:lunch.product,price:0
 msgid "Price"
-msgstr ""
+msgstr "Стоимость"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Search CashMove"
-msgstr ""
+msgstr "Поиск по движению средств"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Total box"
-msgstr ""
+msgstr "Итого касса"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "Lunch Product"
-msgstr ""
+msgstr "Продукция ланча"
 
 #. module: lunch
 #: field:lunch.cashbox,sum_remain:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Итоговый остаток"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Total price"
-msgstr ""
+msgstr "Итоговая цена"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: lunch
 #: field:lunch.cashbox,name:0
@@ -478,30 +484,30 @@ msgstr ""
 #: rml:lunch.order:0
 #: field:lunch.product,name:0
 msgid "Name"
-msgstr ""
+msgstr "Наименование"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Total amount"
-msgstr ""
+msgstr "Итоговая сумма"
 
 #. module: lunch
 #: view:lunch.category:0
 msgid "Category related to Products"
-msgstr ""
+msgstr "Категория, связанная с продукцией"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
 #: view:lunch.cashbox:0
 msgid "Cashboxes"
-msgstr ""
+msgstr "Кассы"
 
 #. module: lunch
 #: view:lunch.category:0
 #: rml:lunch.order:0
 #: view:lunch.order:0
 msgid "Order"
-msgstr ""
+msgstr "Заказ"
 
 #. module: lunch
 #: model:ir.actions.report.xml,name:lunch.report_lunch_order
@@ -509,32 +515,32 @@ msgstr ""
 #: model:ir.ui.menu,name:lunch.menu_lunch
 #: report:lunch.order:0
 msgid "Lunch Order"
-msgstr ""
+msgstr "Заказ ланча"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 msgid "Cash Position by User"
-msgstr ""
+msgstr "Расположение средств по пользователям"
 
 #. module: lunch
 #: field:lunch.cashbox,manager:0
 msgid "Manager"
-msgstr ""
+msgstr "Руководитель"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30 Дней   "
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "To Confirm"
-msgstr ""
+msgstr "Ожидающие подтверждения"
 
 #. module: lunch
 #: field:report.lunch.amount,year:0
 #: view:report.lunch.order:0
 #: field:report.lunch.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
diff --git a/addons/lunch/i18n/sr@latin.po b/addons/lunch/i18n/sr@latin.po
index 09e08e5a8cf..4fba48da440 100644
--- a/addons/lunch/i18n/sr@latin.po
+++ b/addons/lunch/i18n/sr@latin.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: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index 4218f4bfefb..21068ee8cbb 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Reset cashbox"
-msgstr "复位现金箱"
+msgstr "重设外卖现金"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
@@ -37,7 +37,7 @@ msgstr "您确定要取消此订单？"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
 msgid "Cash Moves"
-msgstr ""
+msgstr "现金划拨"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -45,7 +45,7 @@ msgstr ""
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_confirm
@@ -67,6 +67,11 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    这是一个管理午餐的模块\n"
+"保存对午餐订单，现金划拨，外卖现金，外卖品种等的跟踪信息。\n"
+"加入不同类型的外卖品种。\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -78,7 +83,7 @@ msgstr "今日"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: lunch
 #: report:lunch.order:0
@@ -108,12 +113,12 @@ msgstr "金额"
 #: model:ir.ui.menu,name:lunch.menu_lunch_product_form
 #: view:lunch.product:0
 msgid "Products"
-msgstr "产品列表"
+msgstr "品种列表"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_amount
 msgid "Amount available by user and box"
-msgstr ""
+msgstr "用户和外卖现金的可用金额"
 
 #. module: lunch
 #: view:report.lunch.amount:0
@@ -123,14 +128,14 @@ msgstr "   月   "
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order
 msgid "Lunch Orders Statistics"
-msgstr "午餐单统计"
+msgstr "午餐订单统计"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 #: view:lunch.cashmove:0
 #: field:lunch.order,cashmove:0
 msgid "CashMove"
-msgstr ""
+msgstr "现金划拨"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -160,13 +165,13 @@ msgstr "状态"
 #. module: lunch
 #: field:report.lunch.order,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "总价格"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 #: view:report.lunch.amount:0
 msgid "Box Amount by User"
-msgstr ""
+msgstr "用户的外卖现金金额"
 
 #. module: lunch
 #: field:lunch.cashmove,create_date:0
@@ -181,7 +186,7 @@ msgstr "单号/日期"
 #. module: lunch
 #: field:lunch.order,descript:0
 msgid "Description Order"
-msgstr "说明"
+msgstr "订单说明"
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.lunch_order_confirm
@@ -193,14 +198,14 @@ msgstr "确认订单"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:report.lunch.amount:0
 #: view:report.lunch.order:0
 msgid "Box"
-msgstr ""
+msgstr "外卖现金"
 
 #. module: lunch
 #: view:report.lunch.order:0
@@ -220,7 +225,7 @@ msgstr "创建日期"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_category_form
 msgid " Product Categories "
-msgstr " 商品分类 "
+msgstr " 品种分类 "
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,zero:0
@@ -230,25 +235,25 @@ msgstr "设为0"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
 msgid "Cash Move"
-msgstr ""
+msgstr "现金划拨"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: lunch
 #: field:report.lunch.amount,month:0
@@ -260,7 +265,7 @@ msgstr "月"
 #. module: lunch
 #: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
 msgid "Name of box"
-msgstr ""
+msgstr "外卖现金名称"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,cancel:0
@@ -277,12 +282,12 @@ msgstr "分类"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_category_form
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "品种分类"
 
 #. module: lunch
 #: wizard_button:lunch.order.cancel,init,end:0
@@ -297,7 +302,7 @@ msgstr "订单确认"
 #. module: lunch
 #: wizard_view:lunch.cashbox.clean,init:0
 msgid "Are you sure you want to reset this cashbox ?"
-msgstr ""
+msgstr "你确定要重置这外卖现金？"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -308,19 +313,19 @@ msgstr "草稿"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
 #: view:report.lunch.order:0
 msgid "Lunch Order Analysis"
-msgstr ""
+msgstr "午餐订单分析"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: lunch
 #: field:lunch.cashmove,user_cashmove:0
@@ -332,7 +337,7 @@ msgstr "用户名"
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "销售分析"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch
@@ -354,30 +359,30 @@ msgstr "日期"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox_clean
 msgid "clean cashbox"
-msgstr ""
+msgstr "外卖现金清零"
 
 #. module: lunch
 #: field:lunch.cashmove,active:0
 #: field:lunch.product,active:0
 msgid "Active"
-msgstr "激活"
+msgstr "生效"
 
 #. module: lunch
 #: field:report.lunch.order,date:0
@@ -387,18 +392,18 @@ msgstr "订单日期"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox
 msgid "Cashbox for Lunch "
-msgstr ""
+msgstr "午餐的外卖现金 "
 
 #. module: lunch
 #: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
 msgid "Set CashBox to Zero"
-msgstr ""
+msgstr "设置外卖现金为0"
 
 #. module: lunch
 #: field:lunch.cashmove,box:0
 #: field:report.lunch.amount,box:0
 msgid "Box Name"
-msgstr ""
+msgstr "外卖现金的名称"
 
 #. module: lunch
 #: wizard_button:lunch.cashbox.clean,init,end:0
@@ -409,7 +414,7 @@ msgstr "取消"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
 msgid " Cashboxes "
-msgstr ""
+msgstr " 外卖现金列表 "
 
 #. module: lunch
 #: rml:lunch.order:0
@@ -420,7 +425,7 @@ msgstr "单价"
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_form
 #: field:lunch.order,product:0
 msgid "Product"
-msgstr "货品"
+msgstr "品种"
 
 #. module: lunch
 #: rml:lunch.order:0
@@ -432,7 +437,7 @@ msgstr "说明"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: lunch
 #: field:lunch.order,price:0
@@ -443,22 +448,22 @@ msgstr "价格"
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Search CashMove"
-msgstr ""
+msgstr "搜索外卖现金"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Total box"
-msgstr ""
+msgstr "总外卖现金"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "Lunch Product"
-msgstr ""
+msgstr "午餐品种"
 
 #. module: lunch
 #: field:lunch.cashbox,sum_remain:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "总剩余"
 
 #. module: lunch
 #: view:lunch.order:0
@@ -469,7 +474,7 @@ msgstr "总价"
 #: selection:report.lunch.amount,month:0
 #: selection:report.lunch.order,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: lunch
 #: field:lunch.cashbox,name:0
@@ -478,7 +483,7 @@ msgstr "二月"
 #: rml:lunch.order:0
 #: field:lunch.product,name:0
 msgid "Name"
-msgstr "品名"
+msgstr "名称"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -488,13 +493,13 @@ msgstr "总金额"
 #. module: lunch
 #: view:lunch.category:0
 msgid "Category related to Products"
-msgstr ""
+msgstr "该分类的品种"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
 #: view:lunch.cashbox:0
 msgid "Cashboxes"
-msgstr ""
+msgstr "外卖现金列表"
 
 #. module: lunch
 #: view:lunch.category:0
@@ -509,13 +514,13 @@ msgstr "订单"
 #: model:ir.ui.menu,name:lunch.menu_lunch
 #: report:lunch.order:0
 msgid "Lunch Order"
-msgstr ""
+msgstr "午餐订单"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 msgid "Cash Position by User"
-msgstr ""
+msgstr "用户现金状况"
 
 #. module: lunch
 #: field:lunch.cashbox,manager:0
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 1499dd4414e..771779310cb 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -45,7 +45,7 @@ class lunch_product(osv.osv):
     _columns = {
         'name': fields.char('Name', size=50, required=True),
         'category_id': fields.many2one('lunch.category', 'Category'),
-        'description': fields.char('Description', size=128, required=False),
+        'description': fields.text('Description', size=128, required=False),
         'price': fields.float('Price', digits=(16,2)),
         'active': fields.boolean('Active'),
     }
@@ -81,7 +81,7 @@ class lunch_cashbox(osv.osv):
     _columns = {
         'manager': fields.many2one('res.users', 'Manager'),
         'name': fields.char('Name', size=30, required=True, unique = True),
-        'sum_remain': fields.function(amount_available, method=True, string='Total Remaining'),
+        'sum_remain': fields.function(amount_available, string='Total Remaining'),
     }
 
 lunch_cashbox()
@@ -140,7 +140,7 @@ class lunch_order(osv.osv):
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
-        'price': fields.function(_price_get, method=True, string="Price"),
+        'price': fields.function(_price_get, string="Price"),
         'category': fields.many2one('lunch.category','Category'),
     }
 
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
new file mode 100644
index 00000000000..a318df9eee0
--- /dev/null
+++ b/addons/lunch/lunch_installer_view.xml
@@ -0,0 +1,18 @@
+<openerp>
+  <data>
+ <record model="ir.actions.act_window" id="view_lunch_product_form_installer">
+           <field name="name">Define Your Lunch Products</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">lunch.product</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="lunch.view_lunch_product_form"/>
+       </record>
+       
+       <record id="view_lunch_product_form_todo" model="ir.actions.todo">
+           <field name="action_id" ref="view_lunch_product_form_installer"/>
+           <field name="category_id" ref="base.category_tools_customization_config"/>
+           <field name="sequence">50</field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index a08603b6fa4..09f1fcd92a6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -24,15 +24,19 @@
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
                 <form string="Order">
-                    <group colspan="2" col="4">
-                        <field name="user_id" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="product" select="1" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="product" select="1" on_change="onchange_product(product)"/>
+                    <field name="category"/>
+                    <field name="descript"/>
+                    <field name="price"/>
+                    <field name="cashmove"/>
+                    <newline/>
+                   <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
                         <field name="state"/>
+                        <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                        <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -45,7 +49,7 @@
             <field name="model">lunch.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirmed')" string="Order">
+                <tree colors="blue:state == 'draft';black:state == 'confirmed'" string="Order">
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="product"/>
@@ -187,7 +191,6 @@
                 <search string="Search CashMove">
                     <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
@@ -257,11 +260,18 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products">
-                    <field name="name" select="1"/>
-                    <field name="category_id" widget="selection"/>
-                    <field name="description" />
-                    <field name="price" />
-                    <field name="active"/>
+                     <group col="6">
+                          <field name="name" select="1"/>
+                          <field name="category_id" widget="selection"/>
+                          <field name="price" />
+                     </group>
+                     <notebook colspan="4">
+                         <page string="General Information"> 
+                              <field name="active"/>
+                              <separator string="Description" colspan="4" />
+                              <field name="description" nolabel="1" colspan="4" />
+                          </page>
+                     </notebook>
                 </form>
             </field>
         </record>
@@ -276,7 +286,6 @@
                 <tree string="Products">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="description"/>
                     <field name="price"/>
                 </tree>
             </field>
@@ -292,7 +301,6 @@
                 <search string="Products">
                     <field name="name" />
                     <field name="category_id" widget="selection"/>
-                    <field name="description" />
                     <field name="price"/>
                 </search>
             </field>
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 5bd5beafc15..47ea19b26d5 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -101,12 +101,9 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.title and user.address_id.partner_id.title.name) or '' ]] [[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ (user.address_id and user.address_id.street) or '' ]]</para>
-          <para style="terp_default_8">[[ (user.address_id and user.address_id.street2) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ (user.address_id and user.address_id.zip) or '' ]] [[ (user.address_id and user.address_id.city) or '' ]]</para>
-          <para style="terp_default_8">[[ (user.address_id and user.address_id.state_id and user.address_id.state_id.name) or removeParentNode('para')]]</para>
-          <para style="terp_default_8">[[ (user.address_id and user.address_id.country_id and user.address_id.country_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ user.name ]] </para>
+          <para style="terp_default_8">[[ user.login  ]]</para>
+          <para style="terp_default_8">[[ user.user_email ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index e042ac0c594..e84cdb41c0d 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -2,12 +2,13 @@
 <openerp>
 <data noupdate="0">
 
-   	<record model="res.groups" id="base.group_tool_manager">
-        	<field name="name">Tools / Manager</field>
-   		</record>
-   	<record model="res.groups" id="base.group_tool_user">
-        	<field name="name">Tools / User</field>
-   	</record>
-    
+    <record model="res.groups" id="base.group_tool_user">
+        <field name="name">Tools / User</field>
+    </record>
+    <record model="res.groups" id="base.group_tool_manager">
+        <field name="name">Tools / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index e50f4ad222c..3377c98b0e7 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -30,11 +30,11 @@
            <field name="view_id" ref="view_lunch_order_cancel"/>
            <field name="target">new</field>
         </record>
-
+        
         <act_window id="action_lunch_order_cancel_values"
     		key2="client_action_multi" name="Cancel Order"
     		res_model="lunch.order.cancel" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form"/>
-
+     		view_mode="form" target="new" view_type="form"/>
+        
     </data>
 </openerp>