Merge lp:~openerp-dev/openobject-addons/6.1-opw-576964-rha into lp:openobject-addons/6.1
- 6.1-opw-576964-rha
- Merge into 6.1
Status: | Approved |
---|---|
Approved by: | Naresh(OpenERP) |
Approved revision: | 7058 |
Proposed branch: | lp:~openerp-dev/openobject-addons/6.1-opw-576964-rha |
Merge into: | lp:openobject-addons/6.1 |
Diff against target: |
24 lines (+2/-5) 1 file modified
account/account_invoice.py (+2/-5) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-576964-rha |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Naresh(OpenERP) (community) | Approve | ||
Review via email: mp+116615@code.launchpad.net |
Commit message
Description of the change
Hello,
A forward port of r5046 from 6.0, when we remove product from invoice line then it should
reset the unit price to 0.0
Problem occurs for Supplier invoice line, when invoice line form has previously filled Unit Price
and we change prodcut then Unit Price is not updated with the cost price. It remains same for
all the products. It works for customer invoice.
Steps to reproduce:
1. Create a Supplier invoice
2. Select PC1, Unit Price will be 300(cost price of product)
3. Now, select PC2, Unit Price should be 500 but it remais same.
This problem should be in Trunk too.
Please review this fix.
Regards,
Rifakat Haradwala
- 6915. By Olivier Dony (Odoo)
-
[FIX] contract: fix expired contracts reminder job to actually work
The API for sending emails has changed in 6.1, use the new one.
Also fix the expired contract filter to behave similarly to the
"Contracts To Renew" menu inside OpenERP. - 6916. By Olivier Dony (Odoo)
-
[MERGE] OPW 575293: purchase: Supplier references not displayed on purchase order (courtesy of Alexis Delattre)
- 6917. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6918. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6919. By Xavier (Open ERP)
-
[FIX] override read_group of account.move.line to be coherent with overridden search. Solves OPW 575885
- 6920. By Olivier Dony (Odoo)
-
[MERGE] OPW 577359: mail,fetchmail: more robust handling of incoming mails
- Support inconsistent encoding specifications in
mail bodies with crashing
- Mark messages as seen on IMAP servers only when they
have actually been processed
- Properly commit after each incoming message, avoiding
global rollback in case of later failure (during
fetchmail cron task)
- Avoid crashing when importing mail without a proper
From headerNote: this fix depends on a corresponding server fix
(revno: 4248
rev-id: <email address hidden>) - 6921. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6922. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6923. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6924. By Olivier Dony (Odoo)
-
[MERGE] OPW 577225: avoid errors in Sales Analysis for orders without lines
Note: this fix requires an update of the
sale module, or a manual execution of the
query that defines the reporting view. - 6925. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6926. By Olivier Dony (Odoo)
-
[FIX] portal: avoid making new portal users regular Employees
The menus were properly restricted but the portal users
created through the portal wizard on Partners were
erroneously made members of the Employee and Partner Manager
groups.
+ some cleanup in the context management - 6927. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6928. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6929. By Christophe Simonis (OpenERP)
-
[FIX] auth_openid: Due to multiprocessus we must use a FileStore instead of a MemStore to store openid associations.
[FIX] auth_openid: GoogleApps: avoid crash when handle not found in store.
[IMP] auth_openid: flake8. - 6930. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6931. By Olivier Dony (Odoo)
-
[MERGE] project.issue: actually use the Reply-To address of the project when sending out messages
- 6932. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6933. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6934. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6935. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6936. By Xavier ALT
-
[MERGE] OPW 576898: stock: when changing stock.move product lot, do not crash if user didn't fill the product field
- 6937. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6938. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6939. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6940. By Olivier Dony (Odoo)
-
[MERGE] mail.thread: fix message_process to avoid duplicate deliveries
Due to a programming error in the code, any message that had
several values in the References header create as many
duplicate copies of the message as they were previous
messages in the discussion.
Also cleaned up and simplified the code. - 6941. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6942. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6943. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6944. By Quentin (OpenERP) <email address hidden>
-
[MERGE] l10n_be fixes
- 6945. By Olivier Dony (Odoo)
-
[FIX] OPW 576675: base_crypt: avoid causing TransactionRoll
backErrors after each registry reload See individual commit message for more info
- 6946. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6947. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6948. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6949. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6950. By Xavier ALT
-
[MERGE] OPW 576461: account: on invoice move creation, correctly compute quantity and amount currency when journal is configured for grouping
- 6951. By Xavier ALT
-
[MERGE] OPW 574507: mrp: 'change qty' wizard on MO have to also update the related picking list stock move quantity
- 6952. By Olivier Dony (Odoo)
-
[MERGE] OPW 578181: fix missing column in hr.holiday list, making group by date_from fail miserably
- 6953. By Quentin (OpenERP) <email address hidden>
-
[FIX] account_voucher: supplier payment, accounting entry generation
- 6954. By Xavier ALT
-
[MERGE] OPW 576484: account: fix invoice residual, avoid adding multiple times residual for same partial reconcile
- 6955. By Xavier ALT
-
[MERGE] OPW 577014: email_template: for not force mass_mail in mail.compose.
message wizard, if user is working on a single resource - 6956. By Xavier ALT
-
[MERGE] OPW 576491: edi + email_template: correctly generate edi_web_view_url when sending email from mail.compose.
message wizard * edi: improve generation/usage of edi_web_url_view for template rendering
- wrap edi_web_url_view generation to _edi_get_
object_ web_url_ view() method.
- automatically add 'edi_web_url_view' to all email.template rendering context- introduce LazyEdiWebUrlVi
ewGetter class, to allow resolving record wihtin
template rendering context - only when necessary. This to prevent generating
unrequested edi_web_url_view links* mail & email_template: allow to modify render_template context
- add _prepare_
render_ template_ context( ) method to allow modifying context
before rendering template. - 6957. By Quentin (OpenERP) <email address hidden>
-
[MERGE] fixes in account_voucher
- 6958. By Xavier ALT
-
[FIX] OPW 577963: ir_attachment: speed up ir.attachment search for large databases
- 6959. By Olivier Dony (Odoo)
-
[FIX] document: complete previous fix, restore sort order after filtering
- 6960. By Xavier ALT
-
[MERGE] BUG 1039664: edi: fix wrong cursor when generating edi_web_url_view
regression from revid: <email address hidden>
- 6961. By Xavier ALT
-
[MERGE] OPW 577140: stock: use float_compare() to check if initial and provided quantity equals - based on UoM rounding
- 6962. By Olivier Dony (Odoo)
-
[MERGE] OPW 576610: always reuse printed invoice instead of regenerating
Backport of trunk fix r.7215
revid:<email address hidden> - 6963. By Xavier ALT
-
[MERGE] OPW 267641: crm/crm_
action_ rule: mail action are not sent to both action and current watchers - 6964. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6965. By Quentin (OpenERP) <email address hidden>
-
[MERGE] staging branch with fixes
- 6966. By Xavier ALT
-
[MERGE] OPW 574251: account_voucher: voucher on bank statement, have to use period and date from bank statement / bank statement line - not today
- 6967. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6968. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6969. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6970. By Chris Biersbach (OpenERP)
-
[MERGE] OPW 578367: hr_timesheet_sheet: Fixed onchange_employee to also return a value for user_id
- 6971. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6972. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6973. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6974. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6975. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6976. By Olivier Dony (Odoo)
-
[MERGE] OPW 578410: hr_timesheet_
invoice: avoid overriding default data with demo data, as it breaks translations for nodemo databases - 6977. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6978. By Stephane Wirtel (OpenERP)
-
[FIX] warning: rename the product_id_change method to onchange_product_id
- 6979. By Olivier Dony (Odoo)
-
[MERGE] OPW 573257: account.move.line: proper handling of unicode values in period name resolution
- 6980. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6981. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6982. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6983. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6984. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6985. By Olivier Laurent (Open ERP)
-
[FIX] sale_margin: mixed up arguments passed to 'super'
- 6986. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6987. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6988. By Olivier Dony (Odoo)
-
[FIX] account_
analytic_ analysis: reminder should report consumed hours using the correct field As the hours_quantity field is used to flag an account
as `to renew`, it should be used as well when reporting
the consumed quantity. - 6989. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6990. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6991. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6992. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6993. By Xavier ALT
-
[MERGE] OPW 578842: sale_margin: fix call of store parent's '_get_order' function
- 6994. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6995. By Olivier Dony (Odoo)
-
[FIX] OPW 576692: Exported timezones were not specified, and CalDAV clients like mozilla lightning recognize timezone as local instead of UTC
- 6996. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6997. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6998. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 6999. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7000. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7001. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7002. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7003. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7004. By Olivier Dony (Odoo)
-
[FIX] OPW 574637: account_
analytic_ plans: remove the strange behavior of instance editing - a thing of the past - 7005. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7006. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7007. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7008. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7009. By Xavier ALT
-
[MERGE] OPW 50562: stock: fix picking type for chained picking
forward port of v6.0 revid: <email address hidden>
- 7010. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7011. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7012. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7013. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7014. By Olivier Dony (Odoo)
-
[MERGE] OPW 579232: mrp: better handle partial consumption of raw products that were split in production lots
- System will no longer consume every line of raw product after a split
- If a raw product line with the exact quantity to consume is present,
only this one will be consumed
- If no raw product line matches the quantity to consume, the system
will consume the available lines (starting with smallest quantities first)
until it attains the required quantity, possibly splitting one line
further if no combination of the existing lines gives the right
quantity.
- The production lot column and the split button will now be available
on both sides of the production order form, allowing fine control
of the production lots that were consumed, in case the defaults
do not match what was used in reality. - 7015. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7016. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7017. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7018. By Xavier ALT
-
[MERGE] OPW 577045: translations: collective fix of missing translation terms in reports
- 7019. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7020. By Xavier ALT
-
[MERGE] OPW 575716: account: force account.
financial. report balance of *zero* to be displayed positively - 7021. By Xavier ALT
-
[MERGE] OPW 579553: account: fix traceback when modifing existing journal entry line
- 7022. By Xavier ALT
-
[MERGE] OPW 576019: sale/purchase: when changing SO or PO line product, use product's UoM even if current UoM is of the same category
- 7023. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7024. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7025. By Stephane Wirtel (OpenERP)
-
[FIX] point_of_sale: remove unused file
- 7026. By Xavier ALT
-
[MERGE] OPW 578622: project: duplicating project must reset analytic account code
- 7027. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7028. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7029. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7030. By Olivier Dony (Odoo)
-
[FIX] wiki: remove unused 6.0 web addon components - web API was rewritten from scratch in 6.1
- 7031. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7032. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7033. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7034. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7035. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7036. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7037. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7038. By Xavier ALT
-
[MERGE] OPW 577723: purchase: add domain on purchase order partner field for autocomplete to search only for suppliers
- 7039. By Xavier ALT
-
[MERGE] OPW 577045: account/
hr_holidays: fix untranslated string and 'Filter By' display on account reports - 7040. By Xavier ALT
-
[MERGE] OPW 576804: hr_holidays: fix problem with accentuated chars in 'Leaves by Department' report
- 7041. By Xavier ALT
-
[MERGE] OPW 579990: account: changing invoice line account should take product taxes or account taxes, not both
backport of trunk addons revid: <email address hidden>
- 7042. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7043. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7044. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7045. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7046. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7047. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7048. By Xavier ALT
-
[MERGE] OPW 579331: base_vat: button check_vat should not return 'None' uppon success - this will cause error for clients using XML-RPC
- 7049. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7050. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7051. By Xavier ALT
-
[MERGE] OPW 578792: project_
issue/resource: fix calc. of open/close & working hours to open/close on issue + has to be timezone aware - 7052. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7053. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7054. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7055. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7056. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7057. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 7058. By Rifakat Husen (OpenERP)
-
[FIX] account: for web client fix doesn't call on_change while we directly
product from search dropwown and do not reset it
Unmerged revisions
- 7058. By Rifakat Husen (OpenERP)
-
[FIX] account: for web client fix doesn't call on_change while we directly
product from search dropwown and do not reset it
Preview Diff
1 | === modified file 'account/account_invoice.py' | |||
2 | --- account/account_invoice.py 2012-10-05 12:58:20 +0000 | |||
3 | +++ account/account_invoice.py 2012-11-06 11:41:20 +0000 | |||
4 | @@ -1344,10 +1344,7 @@ | |||
5 | 1344 | if not partner_id: | 1344 | if not partner_id: |
6 | 1345 | raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") ) | 1345 | raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") ) |
7 | 1346 | if not product: | 1346 | if not product: |
12 | 1347 | if type in ('in_invoice', 'in_refund'): | 1347 | return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}} |
9 | 1348 | return {'value': {}, 'domain':{'product_uom':[]}} | ||
10 | 1349 | else: | ||
11 | 1350 | return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}} | ||
13 | 1351 | part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) | 1348 | part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) |
14 | 1352 | fpos_obj = self.pool.get('account.fiscal.position') | 1349 | fpos_obj = self.pool.get('account.fiscal.position') |
15 | 1353 | fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False | 1350 | fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False |
16 | @@ -1376,7 +1373,7 @@ | |||
17 | 1376 | tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) | 1373 | tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) |
18 | 1377 | 1374 | ||
19 | 1378 | if type in ('in_invoice', 'in_refund'): | 1375 | if type in ('in_invoice', 'in_refund'): |
21 | 1379 | result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) | 1376 | result.update( {'price_unit': res.standard_price,'invoice_line_tax_id': tax_id} ) |
22 | 1380 | else: | 1377 | else: |
23 | 1381 | result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) | 1378 | result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) |
24 | 1382 | result['name'] = res.partner_ref | 1379 | result['name'] = res.partner_ref |