[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100402041127-nwncr2hfs8t9yht5

8 files changed, 37 insertions, 42 deletions

diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 39f76f1e96b..cdaf9f2aad9 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.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-03-28 20:40+0000\n"
+"PO-Revision-Date: 2010-04-01 22:39+0000\n"
 "Last-Translator: mitev.dmitry <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-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -45,7 +45,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Potvrdit výpis z návrhu"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index e6ed36702a8..67e71fd81a4 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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-02-28 09:03+0000\n"
+"PO-Revision-Date: 2010-04-01 17:22+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <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-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3802,7 +3802,7 @@ msgstr "Wähle Kontenplan"
 #: selection:account.chart,init,target_move:0
 #: model:ir.actions.report.xml,name:account.account_move_line_list
 msgid "All Entries"
-msgstr "Gebucht"
+msgstr "Alle Einträge"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftinvoices0
@@ -4947,7 +4947,7 @@ msgstr "Konto OP Ausgleich"
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr "Gebucht"
+msgstr "Bestätigen"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index d3e4f18e025..0c83df25abc 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-31 14:33+0000\n"
+"PO-Revision-Date: 2010-04-01 15:06+0000\n"
 "Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@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-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -2868,12 +2868,12 @@ msgstr "Tässä kuussa"
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Saatavuus (viikoissa)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Mahdollisuuksien puu"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2895,7 +2895,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Sähköpostiosoite"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2909,17 +2909,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Liittyvä tapahtuma"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Palvelintoiminto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Kaikki vaateet"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index cda897104fc..03784511f14 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -64,7 +64,7 @@ class pos_company_discount(osv.osv):
         'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
         'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
         'account_receivable': fields.many2one('account.account',
-            'Default Receivable', required=True, states={'draft': [('readonly', False)]}),
+            'Default Receivable', states={'draft': [('readonly', False)]}),
      }
 
 pos_company_discount()
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index f5ce8368bbe..828af84636a 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -663,7 +663,7 @@ invoiced
                     <page string="Other">
                       <field  name="company_discount" colspan="4"/>
                       <field  name="max_diff" colspan="4"/>
-                      <field  name="account_receivable" colspan="4"/>
+                      <field  name="account_receivable" required="1" colspan="4"/>
                     </page>
                 </notebook>
         	</field>
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 29299257750..3ad2d27f6d2 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -53,15 +53,16 @@ class pos_make_payment(osv.osv_memory):
         else:
             journal = None
 
-        order = self.pool.get('pos.order').browse(cr, uid, record_id, context)
+        order_obj=self.pool.get('pos.order')
+        order = order_obj.browse(cr, uid, record_id, context)
         #get amount to pay
         amount = order.amount_total - order.amount_paid
 
         if amount <= 0.0:
             context.update({'flag': True})
-            self.pool.get('pos.order').action_paid(cr, uid, [record_id], context)
+            order_obj.action_paid(cr, uid, [record_id], context)
         elif order.amount_paid > 0.0:
-            self.pool.get('pos.order').write(cr, uid, [record_id], {'state': 'advance'})
+            order_obj.write(cr, uid, [record_id], {'state': 'advance'})
 
         invoice_wanted_checked = False
 
@@ -183,12 +184,6 @@ class pos_make_payment(osv.osv_memory):
             'datas': datas,
        }
 
-    def trigger_wkf(self, cr, uid, data, context):
-        record_id = context and context.get('active_id', False)
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'pos.order', record_id, 'payment', cr)
-        return {}
-
     _columns = {
         'journal': fields.selection(pos_box_entries.get_journal, "Journal", required=True),
         'product_id': fields.many2one('product.product', "Acompte"),
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 771ec3c72e3..6608f837a63 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -24,10 +24,10 @@
 				    	<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
 				    </group>
 				    <newline/>
-				    <separator orientation="vertical"/>
-            		<button icon='gtk-cancel' special="cancel" string="Cancel" />
-					<button name="trigger_wkf" string="Finish" colspan="1" type="object" icon="gtk-ok"/>	
-					<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>	
+				    <group col="2" colspan="4">
+	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
+						<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>
+					</group>	
 				 </group>
 				</form>
             </field>
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 2b5cd16c4a9..aa551a7ace7 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-31 08:48+0000\n"
+"PO-Revision-Date: 2010-04-01 14:53+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -268,7 +268,7 @@ msgstr "Нетна цена"
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr "Мойте активни поръчки за продажба"
+msgstr "Мои активни поръчки за продажба"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -382,7 +382,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr "Мойте поръчки за продажба очакващи фактура"
+msgstr "Мои поръчки за продажба, очакващи фактура"
 
 #. module: sale
 #: rml:sale.order:0
@@ -536,7 +536,7 @@ msgstr "Групиране на фактури"
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr "Всички запитвания"
+msgstr "Всички оферти"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -563,7 +563,7 @@ msgstr "Снабдяване за всеки ред"
 #: model:ir.actions.act_window,name:sale.action_order_tree10
 #: model:ir.ui.menu,name:sale.menu_action_order_tree10
 msgid "My Quotations"
-msgstr "Моите запитвания"
+msgstr "Мои оферти"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
@@ -758,7 +758,7 @@ msgstr "Продажба на продукти"
 #. module: sale
 #: rml:sale.order:0
 msgid "Our Salesman"
-msgstr "Нашия търговец"
+msgstr "Лице за контакт"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,init,create:0
@@ -797,7 +797,7 @@ msgstr "Свойства"
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
 msgid "Quotation"
-msgstr "Запитване"
+msgstr "Оферта"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -876,7 +876,7 @@ msgstr ""
 #. module: sale
 #: rml:sale.order:0
 msgid "Your Reference"
-msgstr "Вашата отпратка"
+msgstr "Ваш референтен номер"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1054,7 +1054,7 @@ msgstr "Поръчка за продажба"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr "Запитване (проект на поръчка за продажба)"
+msgstr "Оферта (поръчка за продажба в етап на проект)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1101,7 +1101,7 @@ msgstr "Доставка"
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr "Запитване / Поръчка"
+msgstr "Оферта / Поръчка"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1111,7 +1111,7 @@ msgstr "Тел. :"
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr "Запитване N°"
+msgstr "Оферта №"
 
 #. module: sale
 #: field:stock.move,sale_line_id:0