Merge lp:~openerp-dev/openobject-addons/6.0-opw-51169-ado into lp:openobject-addons/6.0

[Amit Dodiya (OpenERP)]

Hello,

[FIX] Incorrect account when using fiscal position and order policy Invoice From The Picking"

Thanks,
Amit

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Xavier ALT (dex-phx)]

Hello,

This branch broke some test in "sales" module:
http://runbot.openerp.com/openerp-dev-6-0-opw-51169-ado-3245/logs/test-all.txt

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.0-opw-51169-ado]

5088. By Launchpad Translations on behalf of openerp on 2012-02-22

Launchpad automatic translations update.

[Amit Dodiya (OpenERP) (ado-openerp)]

Hello Xavier ALT,

The problem you are pointing in this given text file is due to the null value passed field "report_type" in l10n_it/account.account.type.csv file, Changes on that file has already been merged at revision:5056

You can check with the given link : http://bazaar.launchpad.net/~openerp/openobject-addons/6.0/revision/5056, As failure occurred due to that file only.

Kindly check the issue again with the latest revision and let me know the result.

Thanks in advance.

Regards,
Amit Dodiya

[lp:~openerp-dev/openobject-addons/6.0-opw-51169-ado]

5089. By Launchpad Translations on behalf of openerp on 2012-02-23

Launchpad automatic translations update.

5090. By Launchpad Translations on behalf of openerp on 2012-02-24

Launchpad automatic translations update.

5091. By Jean-Christophe VASSORT on 2012-02-24

[MERGE] OPW 17833: System does not take into account the currency of the pricelist if base price is 'Partner section in product form'

5092. By Jean-Christophe VASSORT on 2012-02-24

[MERGE] OPW 18123

5093. By Xavier ALT on 2012-02-24

[MERGE] OPW 57602

5094. By Xavier ALT on 2012-02-24

[MERGE] OPW 383510

5095. By Xavier ALT on 2012-02-24

[MERGE] resubmit OPW 383649

5096. By Launchpad Translations on behalf of openerp on 2012-02-25

Launchpad automatic translations update.

5097. By Launchpad Translations on behalf of openerp on 2012-02-26

Launchpad automatic translations update.

5098. By Launchpad Translations on behalf of openerp on 2012-02-27

Launchpad automatic translations update.

5099. By Launchpad Translations on behalf of openerp on 2012-02-28

Launchpad automatic translations update.

5100. By Launchpad Translations on behalf of openerp on 2012-02-29

Launchpad automatic translations update.

5101. By Launchpad Translations on behalf of openerp on 2012-03-01

Launchpad automatic translations update.

5102. By Launchpad Translations on behalf of openerp on 2012-03-02

Launchpad automatic translations update.

5103. By Xavier ALT on 2012-03-02

[MERGE] OPW 381937 - stock: product valuation having a price of 0 should be 0, not 1

5104. By Xavier ALT on 2012-03-02

[MERGE] OPW 381848 - search_default filter not working for purchase requisition

5105. By Jean-Christophe VASSORT on 2012-03-02

[MERGE] OPW 50627 Issue with act_window

related to this bug: https://bugs.launchpad.net/openobject-addons/+bug/708467

To reproduce the issue:

1 Create a new database with demo and sale module
2. Open Menu Sale/Address Book/Customers
3. Search Agrolait and open it
4. Click on Sales (link)
5. You must see 2 sales
6. Create new sale order
7. The customer field is empty (should have Agrolait)

This happens with all act_windows.

5106. By Xavier ALT on 2012-03-06

[MERGE] OPW 16328 - do not request write off when generating fy opening entries

5107. By Xavier ALT on 2012-03-06

[MERGE] OPW 382063 - account fiscal year closing: fix default date in opening entries

5108. By Xavier ALT on 2012-03-06

[MERGE] OPW 279130 - translate errors raised inside product_id_change (sale/purchase) dep. on user lang., not partner lang.

5109. By Xavier ALT on 2012-03-06

[MERGE] OPW 51075 - account.move.line: reconcile_partial() error msg when lines are already reconciled

5110. By Xavier ALT on 2012-03-06

[MERGE] OPW 51189 - on invoice 'refund', keep original salesman and fiscal position

5111. By Xavier ALT on 2012-03-06

[MERGE] OPW 18001: do not lock-out user when payment.order is 'done', allow it to cancel it

  - When 'Payment Order' is in 'done' state, the workflow is frozen and the
    user is unable to cancel it (required in case bank refuse the payment).
    This allow to cancel the payment order except when some lines are already
    imported in a bank statement (i.e payment done bank-side: modification
    forbidden).

5112. By Xavier ALT on 2012-03-06

[MERGE] OPW 18001: l10n_ch: create_date wizard was not saving file inside wizard

5113. By Xavier ALT on 2012-03-06

[MERGE] OPW 381524 - on picking invoicing, do not invoice scrapped products

5114. By Launchpad Translations on behalf of openerp on 2012-03-07

Launchpad automatic translations update.

5115. By Launchpad Translations on behalf of openerp on 2012-03-08

Launchpad automatic translations update.

5116. By nel on 2012-03-08

[MERGE]

5117. By nel on 2012-03-08

[MERGE]

5118. By nel on 2012-03-08

[MERGE]

5119. By nel on 2012-03-08

[MERGE]

5120. By nel on 2012-03-08

[MERGE]

5121. By Launchpad Translations on behalf of openerp on 2012-03-09

Launchpad automatic translations update.

5122. By Launchpad Translations on behalf of openerp on 2012-03-10

Launchpad automatic translations update.

5123. By Jean-Christophe VASSORT on 2012-03-12

[MERGE] OPW 51090 Freight tax not calculating automatically on invoice

5124. By Jean-Christophe VASSORT on 2012-03-12

[MERGE] OPW 381630 Shipping address of the company in the receipt does not match the address of the company entered the store.

When going through the act_window "Receptions" in Purchase Order, address field of stock.picking(Receptions)
form shows the partner name instead of partner address.And also, the picking address should be filled with
the destination_address from particular PO and if that is not the case then the address of warehouse should
be considered otherwise shipping address or default address of Company should be considered.
Currently, it is taking the address of Supplier if destination address not specified in PO.

5125. By Launchpad Translations on behalf of openerp on 2012-03-13

Launchpad automatic translations update.

5126. By Xavier ALT on 2012-03-13

[MERGE] OPW 18010: mail_gateway: handle attachment sent with mimetype EXT/octet-stream as raw attachment

5127. By Xavier ALT on 2012-03-13

[MERGE] OPW 32677: account_voucher: add missing type in 'line_{dr,cr}_ids' fields context + add domains on voucher line form view

5128. By Xavier ALT on 2012-03-13

[MERGE] OPW 50851: sale.report: use product default uom as reference + fix UoM translation by using 'product_uom' field

5129. By Xavier ALT on 2012-03-13

[MERGE] OPW 50921: purchase report: fix duplicated row for UoM category having more that one reference Uom

5130. By Xavier ALT on 2012-03-13

[MERGE] OPW 381886: l10n_be: fix ask restitution/payment on vat declaration

5131. By Xavier ALT on 2012-03-13

[FIX] purchase: add missing coma in sql query

5132. By Xavier ALT on 2012-03-13

[MERGE] OPW 381973: stock: do not compute product values on stock location when there is no product_id submitted through context

5133. By Xavier ALT on 2012-03-13

[MERGE] OPW 381973: account: accounting dashboard must filter datas per company - multi-company support

5134. By Xavier ALT on 2012-03-13

[MERGE] OPW 510047: fix demo data for project 'Integrate a Sale and Warehouse Management'

5135. By Launchpad Translations on behalf of openerp on 2012-03-14

Launchpad automatic translations update.

5136. By Xavier ALT on 2012-03-14

[MERGE] OPW 381537: force date and period update on voucher when confirming bank statement + take statement date as default statement line date

5137. By Xavier ALT on 2012-03-14

[MERGE] OPW 383672: stock: improve speed of product's stock quantity/value calculation

5138. By Xavier ALT on 2012-03-14

[MERGE] OPW 383606: stock: partial picking wizard: fix an rounding issue on exceeding qty check

5139. By Launchpad Translations on behalf of openerp on 2012-03-15

Launchpad automatic translations update.

5140. By Launchpad Translations on behalf of openerp on 2012-03-16

Launchpad automatic translations update.

5141. By Xavier ALT on 2012-03-16

[MERGE] OPW 572444: account: fix invoice analysis for tax included amount (using price_subtotal for 'total untaxed')

5142. By Xavier ALT on 2012-03-16

[MERGE] OPW 381883: crm: for default body, default reply body use user signature, not the case responsible signature

5143. By Xavier ALT on 2012-03-16

[MERGE] OPW 515712: account: default bank statement line date as today if do not contextual date

5144. By Xavier ALT on 2012-03-16

[MERGE] OPW 50604: account: on taxe report is was difficult to differentiate between 'tax codes' and 'financial accounts'

5145. By Launchpad Translations on behalf of openerp on 2012-03-17

Launchpad automatic translations update.

5146. By Launchpad Translations on behalf of openerp on 2012-03-19

Launchpad automatic translations update.

5147. By Xavier ALT on 2012-03-19

[MERGE] OPW 382055: allow accounting/manager to create new sequence type at journal creation

5148. By Xavier ALT on 2012-03-19

[MERGE] OPW 18195: invoice: do not allow modification of 'check total' field when invoice is in 'paid' state

5149. By Launchpad Translations on behalf of openerp on 2012-03-20

Launchpad automatic translations update.

5150. By nel on 2012-03-20

[IMP] purchase: avoid copying the move_dest_id while duplicating

5151. By Yannick Vaucher@Camptocamp on 2012-03-20

[MERGE] OPW 57622: base_action_rule: complete date time if date_field contains only a date

5152. By Launchpad Translations on behalf of openerp on 2012-03-21

Launchpad automatic translations update.

5153. By Launchpad Translations on behalf of openerp on 2012-03-22

Launchpad automatic translations update.

5154. By Launchpad Translations on behalf of openerp on 2012-03-23

Launchpad automatic translations update.

5155. By Launchpad Translations on behalf of openerp on 2012-03-24

Launchpad automatic translations update.

5156. By Launchpad Translations on behalf of openerp on 2012-03-25

Launchpad automatic translations update.

5157. By Xavier ALT on 2012-03-26

[MERGE] OPW 383653: sale: Salesman is not transmitted between the Sale Order and the Invoice while creating 'Invoice from Picking'

5158. By Xavier ALT on 2012-03-26

[MERGE] OPW 572562: pass 'note' field for invoice created from sale order / stock picking

5159. By Xavier ALT on 2012-03-26

[MERGE] OPW 572473: account_voucher: fix update of lines amount when paying a refunded customer invoice

5160. By Xavier ALT on 2012-03-26

[MERGE] OPW 572592: l10n_uk: internal type for VAT account should be 'other'

5161. By Xavier ALT on 2012-03-26

[MERGE] OPW 51079: purchase: if invoicing control is 'from picking', line with product type = 'service' have to be invoiced too

[Xavier ALT (dex-phx)]

Hello Amit,

I still disagree with that MP:

- L16-L32: product account mapping should be done per-line, not only once. Here "new_acc" mapping is done 1 time
- L33-L34: ppdating all exisitng account.invoice.line with the same account_id is not right, different product could make different accounts

So basically, for each existing account.invoice.line on "invoice_created",
- if product_id is defined, find original 'account_id' then apply mapping on it.
- if no product_id, apply mapping on the exising 'account_id'

Could you please update this,

Cheers,
Xavier

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.0-opw-51169-ado]

5162. By Xavier ALT on 2012-03-26

[MERGE] OPW 382027: mrp: fix layout problem in 'Product cost structure' report

5163. By Xavier ALT on 2012-03-26

[MERGE] OPW 382088: account: build_ctx_periods method return more periods than asked when both period are the same

5164. By Launchpad Translations on behalf of openerp on 2012-03-27

Launchpad automatic translations update.

5165. By Xavier ALT on 2012-03-27

[MERGE] OPW 381582: stock: on inventory, product qty should be computed up to 'inventory date', not after

5166. By Xavier ALT on 2012-03-27

[MERGE] OPW 572905: fix Integrity Error when account move line have an amount of 0 (zero)

5167. By Launchpad Translations on behalf of openerp on 2012-03-28

Launchpad automatic translations update.

5168. By Launchpad Translations on behalf of openerp on 2012-03-29

Launchpad automatic translations update.

5169. By Xavier ALT on 2012-03-29

[MERGE] OPW 573067: stock: improve speed of procurement schedulers

5170. By Launchpad Translations on behalf of openerp on 2012-03-30

Launchpad automatic translations update.

5171. By Xavier ALT on 2012-03-30

[MERGE] OPW 383665: account: fix 'filter by periods' for balance sheet, general ledger and profit&loss reports

5172. By Xavier ALT on 2012-03-30

[MERGE] OPW 383660: product: when saving new uom ratio, bad rounding on ratio could change it

5173. By Xavier ALT on 2012-03-30

[MERGE] OPW 573067: procurement: add missing index on 'priority' and 'date_planned' fields

5174. By Xavier ALT on 2012-03-30

[MERGE] OPW 572587: audittrail: log name as blank in case logged object does not have a 'name' field

5175. By Xavier ALT on 2012-03-30

[MERGE] OPW 572490: project: when unlinking analytic account, do not raise AccessError when linked to a project

5176. By Launchpad Translations on behalf of openerp on 2012-03-31

Launchpad automatic translations update.

5177. By Launchpad Translations on behalf of openerp on 2012-04-01

Launchpad automatic translations update.

5178. By Launchpad Translations on behalf of openerp on 2012-04-02

Launchpad automatic translations update.

5179. By Xavier ALT on 2012-04-02

[MERGE] OPW 50624: project: on task, widget='float_time' was not correctly set whith language other than English

5180. By Launchpad Translations on behalf of openerp on 2012-04-03

Launchpad automatic translations update.

5181. By Xavier ALT on 2012-04-03

[MERGE] OPW 18442: stock: view location (having no associated stock moves) have to consolidate products defined on child location

5182. By Launchpad Translations on behalf of openerp on 2012-04-04

Launchpad automatic translations update.

5183. By Launchpad Translations on behalf of openerp on 2012-04-05

Launchpad automatic translations update.

5184. By Amit Dodiya (OpenERP) on 2012-04-05

[FIX] Incorrect account when using fiscal position and order policy Invoice From The Picking

[Amit Dodiya (OpenERP) (ado-openerp)]

Hello Xavier,

I have changed the code.

Thanks,
Amit

review: Needs Resubmitting

Unmerged revisions

5184. By Amit Dodiya (OpenERP) on 2012-04-05

[FIX] Incorrect account when using fiscal position and order policy Invoice From The Picking

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-04-03 14:18:40 +0000
+++ stock/stock.py	2012-04-05 07:26:19 +0000
@@ -1077,7 +1077,12 @@
                 uos_id = move_line.product_uos and move_line.product_uos.id or False
                 if not uos_id and inv_type in ('out_invoice', 'out_refund'):
                     uos_id = move_line.product_uom.id
-                account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
+                    
+                if picking.sale_id.fiscal_position:
+                    account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, picking.sale_id.fiscal_position, account_id)
+                else:
+                    account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
+                    
                 if move_line.price_unit != 0 and price_unit != move_line.price_unit:
                     price_unit = move_line.price_unit
                 invoice_line_id = invoice_line_obj.create(cr, uid, {