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 \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 \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 \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 \n" "Language-Team: Finnish \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/__terp__.py b/addons/point_of_sale/__terp__.py index b1838a28fc1..f1d847cf76d 100644 --- a/addons/point_of_sale/__terp__.py +++ b/addons/point_of_sale/__terp__.py @@ -62,6 +62,7 @@ Main features : 'wizard/pos_payment_report_user.xml', 'wizard/pos_payment_report.xml', 'wizard/pos_payment.xml', + 'wizard/pos_scan_product_view.xml', 'pos_report.xml', 'pos_wizard.xml', 'pos_view.xml', diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index c551ccd9ca0..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() @@ -1360,7 +1360,7 @@ class report_sales_by_margin_pos(osv.osv): # 'pos_name': fields.char('POS Order', size=64, readonly=True), 'product_name':fields.char('Product Name', size=64, readonly=True), 'date_order': fields.date('Order Date',required=True, select=True), - 'amount': fields.float('Total', readonly=True, select=True), + # 'amount': fields.float('Total', readonly=True, select=True), 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True), 'qty': fields.float('Qty', readonly=True, select=True), 'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True), @@ -1409,7 +1409,7 @@ class report_sales_by_margin_pos_month(osv.osv): # 'pos_name': fields.char('POS Order', size=64, readonly=True), 'product_name':fields.char('Product Name', size=64, readonly=True), 'date_order': fields.date('Order Date',required=True, select=True), - 'amount': fields.float('Total', readonly=True, select=True), + #'amount': fields.float('Total', readonly=True, select=True), 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True), 'qty': fields.float('Qty', readonly=True, select=True), 'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True), 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 - + diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv index a761e78c362..a36d631968a 100644 --- a/addons/point_of_sale/security/ir.model.access.csv +++ b/addons/point_of_sale/security/ir.model.access.csv @@ -27,4 +27,14 @@ "access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,0,0,0 "acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0 "access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0 -"acess_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_sale_user","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0 +"access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_payment_report_user","pos.payment.report.user","model_pos_payment_report_user","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0 +"access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0 diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py index 1384fb8329a..ba62c1f78f9 100644 --- a/addons/point_of_sale/wizard/__init__.py +++ b/addons/point_of_sale/wizard/__init__.py @@ -20,11 +20,8 @@ # ############################################################################## -#import wizard_pos_payment -import wizard_default_journal -import wizard_scan_product import wizard_return -#import wizard_open_statement + import pos_add_product import pos_confirm import pos_discount @@ -43,6 +40,7 @@ import pos_payment_report_user import pos_payment_report_date import pos_payment_report import pos_payment +import pos_scan_product # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index 1d9214c3645..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 @@ -111,7 +112,7 @@ class pos_make_payment(osv.osv_memory):