Invoiced to
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]]
- [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']]
+ [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]
+ [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.street or '']]
+ [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.zip or '']]
+ [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.city or '' ]]
+ [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.country_id and o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']]
|
[[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']]
@@ -159,7 +159,7 @@
- [[ o.sale_id and o.sale_id.name ]]
+ [[ o.origin ]]
|
[[ o.sale_id and o.sale_id.date_order or '']]
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index be573f70422..88e6946ba17 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -735,6 +735,7 @@ class sale_order_line(osv.osv):
a = self.pool.get('account.fiscal.position').map_account(cr, uid, line.order_id.partner_id, a)
inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
'name': line.name,
+ 'origin':line.order_id.name,
'account_id': a,
'price_unit': pu,
'quantity': uosqty,
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index 58238ebcabd..6d741307924 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -60,7 +60,7 @@ def _createInvoices(self, cr, uid, data, context={}):
if sale.order_policy == 'postpaid':
raise osv.except_osv(
_('Error'),
- _('You cannot make an advance on a sale order that is defined as \'Automatic Invoice after delivery\'.'))
+ _("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."))
val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id)
line_id =obj_lines.create(cr, uid, {
'name': val['value']['name'],
diff --git a/addons/sale_analytic_plans/i18n/fr_FR.po b/addons/sale_analytic_plans/i18n/fr_FR.po
index 0355aa81f23..e3987e6074e 100644
--- a/addons/sale_analytic_plans/i18n/fr_FR.po
+++ b/addons/sale_analytic_plans/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-09-05 16:25+0000\n"
"PO-Revision-Date: 2008-10-13 16:22+0000\n"
"Last-Translator: Olivier Laurent \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/addons/sale_crm/i18n/fr_FR.po b/addons/sale_crm/i18n/fr_FR.po
index 690933e631a..03202bc0c67 100644
--- a/addons/sale_crm/i18n/fr_FR.po
+++ b/addons/sale_crm/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-09-05 13:33+0000\n"
"PO-Revision-Date: 2008-10-11 08:42+0000\n"
"Last-Translator: Christophe Chauvet \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/addons/sale_journal/i18n/fr_FR.po b/addons/sale_journal/i18n/fr_FR.po
index 3e2eba754d8..a56a08142d9 100644
--- a/addons/sale_journal/i18n/fr_FR.po
+++ b/addons/sale_journal/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-09-05 16:04+0000\n"
"PO-Revision-Date: 2008-10-13 16:29+0000\n"
"Last-Translator: Olivier Laurent \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/addons/scrum/i18n/fr_FR.po b/addons/scrum/i18n/fr_FR.po
index fbb5bec2116..f99f845f781 100644
--- a/addons/scrum/i18n/fr_FR.po
+++ b/addons/scrum/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-09-05 13:28+0000\n"
"PO-Revision-Date: 2008-10-14 07:18+0000\n"
"Last-Translator: Olivier Laurent \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/addons/stock/i18n/fr_FR.po b/addons/stock/i18n/fr_FR.po
index becb07c6dce..42f2d35350b 100644
--- a/addons/stock/i18n/fr_FR.po
+++ b/addons/stock/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
"Last-Translator: <>\n"
-"Language-Team: \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index af90192f326..63ecd5a354d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -625,10 +625,16 @@ class stock_picking(osv.osv):
address_contact_id, address_invoice_id = \
self._get_address_invoice(cursor, user, picking).values()
- comment = self._get_comment_invoice(cursor, user, picking)
-
+ comment = self._get_comment_invoice(cursor, user, picking)
if group and partner.id in invoices_group:
invoice_id = invoices_group[partner.id]
+ invoice=invoice_obj.browse(cursor, user,invoice_id)
+ invoice_vals = {
+ 'name': invoice.name +', '+picking.name,
+ 'origin': invoice.origin+', '+picking.name+(picking.origin and (':' + picking.origin) or ''),
+ 'comment':(comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
+ }
+ invoice_obj.write(cursor, user, [invoice_id],invoice_vals,context=context)
else:
invoice_vals = {
'name': picking.name,
@@ -651,6 +657,9 @@ class stock_picking(osv.osv):
invoices_group[partner.id] = invoice_id
res[picking.id] = invoice_id
for move_line in picking.move_lines:
+ origin=move_line.picking_id.name
+ if move_line.picking_id.origin:
+ origin+=':' + move_line.picking_id.origin
if group:
name = picking.name + '-' + move_line.name
else:
@@ -679,6 +688,7 @@ class stock_picking(osv.osv):
account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id)
invoice_line_id = invoice_line_obj.create(cursor, user, {
'name': name,
+ 'origin':origin,
'invoice_id': invoice_id,
'uos_id': move_line.product_uos.id,
'product_id': move_line.product_id.id,
diff --git a/addons/stock_location/i18n/fr_FR.po b/addons/stock_location/i18n/fr_FR.po
index ab640bcbbed..25b3fb7e8e3 100644
--- a/addons/stock_location/i18n/fr_FR.po
+++ b/addons/stock_location/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-09-11 15:41:43+0000\n"
"PO-Revision-Date: 2008-09-11 15:41:43+0000\n"
"Last-Translator: <>\n"
-"Language-Team: \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
diff --git a/addons/stock_no_autopicking/i18n/fr_FR.po b/addons/stock_no_autopicking/i18n/fr_FR.po
index 5993d454c4b..6ed74038598 100644
--- a/addons/stock_no_autopicking/i18n/fr_FR.po
+++ b/addons/stock_no_autopicking/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-10-28 08:55:32+0000\n"
"PO-Revision-Date: 2008-10-28 08:55:32+0000\n"
"Last-Translator: <>\n"
-"Language-Team: \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
diff --git a/addons/subscription/i18n/fr_FR.po b/addons/subscription/i18n/fr_FR.po
index a83e30993da..a24637dd643 100644
--- a/addons/subscription/i18n/fr_FR.po
+++ b/addons/subscription/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-09-05 13:23+0000\n"
"PO-Revision-Date: 2008-10-13 17:01+0000\n"
"Last-Translator: Olivier Laurent \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/addons/warning/i18n/fr_FR.po b/addons/warning/i18n/fr_FR.po
index 1a1ef6eeb88..f53107a7298 100644
--- a/addons/warning/i18n/fr_FR.po
+++ b/addons/warning/i18n/fr_FR.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2008-10-27 15:28:26+0000\n"
"PO-Revision-Date: 2008-10-27 15:28:26+0000\n"
"Last-Translator: <>\n"
-"Language-Team: \n"
+"Language-Team: OpenERP Language Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
| |