diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 4ab7e6329a9..7ccba2faf9b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -798,8 +798,8 @@ - - + + diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 7bfc4b702a7..446fea4d0df 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -193,7 +193,7 @@ class account_invoice(osv.osv): temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids) lines += [x for x in temp_lines if x not in lines] src.append(m.id) - + lines = filter(lambda x: x not in src, lines) result[invoice.id] = lines return result @@ -230,7 +230,7 @@ class account_invoice(osv.osv): _order = "number" _columns = { 'name': fields.char('Description', size=64, select=True,readonly=True, states={'draft':[('readonly',False)]}), - 'origin': fields.char('Origin', size=64, help="Reference of the document that produced this invoice."), + 'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice."), 'type': fields.selection([ ('out_invoice','Customer Invoice'), ('in_invoice','Supplier Invoice'), @@ -1000,7 +1000,7 @@ class account_invoice(osv.osv): if invoice.type in ('in_invoice', 'in_refund'): ref = invoice.reference else: - ref = self._convert_ref(cr, uid, invoice.number) + ref = self._convert_ref(cr, uid, invoice.number) # Pay attention to the sign for both debit/credit AND amount_currency l1 = { 'debit': direction * pay_amount>0 and direction * pay_amount, @@ -1240,11 +1240,11 @@ class account_invoice_line(osv.osv): company = self.pool.get('res.company').browse(cr, uid, company_id) currency = self.pool.get('res.currency').browse(cr, uid, currency_id) - + if not currency.company_id.id == company.id: raise osv.except_osv(_('Configration Error !'), _('Can not select currency that is not related to any company.\nPlease select accordingly !.')) - + if company.currency_id.id != currency.id: new_price = res_final['value']['price_unit'] * currency.rate res_final['value']['price_unit'] = new_price diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py index 9aee4983454..9c644262969 100644 --- a/addons/board_manufacturing/__terp__.py +++ b/addons/board_manufacturing/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -27,7 +27,7 @@ 'description': """ This module creates a dashboards for Manufaturing that includes: * List of next production orders - * List of deliveries (out packing) + * List of deliveries (out picking) * Graph of work center load * List of procurement in exception """, diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py index 46b15412d88..5897cdb2f99 100644 --- a/addons/delivery/__terp__.py +++ b/addons/delivery/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,7 +24,7 @@ 'name': 'Carriers and deliveries', 'version': '1.0', 'category': 'Generic Modules/Sales & Purchases', - 'description': """Allows you to add delivery methods in sales orders and packing. You can define your own carrier and delivery grids for prices. When creating invoices from picking, Open ERP is able to add and compute the shipping line.""", + 'description': """Allows you to add delivery methods in sales orders and picking. You can define your own carrier and delivery grids for prices. When creating invoices from picking, Open ERP is able to add and compute the shipping line.""", 'author': 'Tiny', 'depends': ['sale', 'purchase', 'stock'], 'init_xml': ['delivery_data.xml'], diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 5ea85a44404..170ee9cec4d 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -394,7 +394,7 @@ class mrp_production(osv.osv): _columns = { 'name': fields.char('Reference', size=64, required=True), - 'origin': fields.char('Origin', size=64, help="Reference of the document that generated this production order request."), + 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."), 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority'), 'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','<>','service')]), @@ -426,7 +426,7 @@ class mrp_production(osv.osv): 'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'), 'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'), 'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True, - help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\ + help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\ \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'), 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'), 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'), @@ -784,7 +784,7 @@ class mrp_procurement(osv.osv): _order = 'priority,date_planned' _columns = { 'name': fields.char('Name', size=64, required=True, help='Requisition name.'), - 'origin': fields.char('Origin', size=64, + 'origin': fields.char('Source Document', size=64, help="Reference of the document that created this Requisition.\n" "This is automatically completed by Open ERP."), 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True), @@ -1087,7 +1087,7 @@ class mrp_procurement(osv.osv): #Passing partner_id to context for purchase order line integrity of Line name context.update({'lang':partner.lang, 'partner_id':partner_id}) - + product=self.pool.get('product.product').browse(cr,uid,procurement.product_id.id,context=context) line = { diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 48cde381e31..9162051086c 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -89,7 +89,7 @@ - + diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index c05df176d56..af9d8e5bf06 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -77,7 +77,7 @@ -->