Commit Graph

342 Commits

Author SHA1 Message Date
Martin Trigaux 7e33a4746b Forward port of branch 7.0 up to b3485fb 2014-10-03 15:17:36 +02:00
Martin Trigaux 066fbb6613 [FIX] account_anglo_saxon: price difference, discount and taxes
When computing the price difference amount do not integrate the eventual discount and taxes included in the price.
Otherwise the total of the generated accounting enty would be higher than the total of the invoice. opw 611350
2014-10-03 12:19:01 +02:00
Denis Ledoux 5bd0249515 [MERGE] forward port of branch 7.0 up to a218a9e 2014-09-18 16:05:34 +02:00
Martin Trigaux 3a50d4b35b [FIX] account_anglo_saxon: correctly set the accounts for returns
The generated moves on a return should be the reverse of the outgoing move.
Fixes #1817, opw 604417
2014-09-17 17:10:55 +02:00
Daniel Dico 9a763928e1 [FIX] account_anglo_saxon: variable 'standard_price' referenced before assignment
Due to forward-port, the variable standard_price was reintroduced instead of valuation_price_unit
Move the change of currency after the fifo/lifo computation.
Fixes #1801
2014-08-19 17:16:28 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
2014-08-14 03:38:58 +02:00
Denis Ledoux 8a7728790b [MERGE] forward port of branch 7.0 up to 60ab6f1 2014-08-12 17:49:12 +02:00
Ruchir Shukla b2f1c764cd [FIX] account_anglo_saxon: avoid duplication of price difference lines
When computing the price difference lines, in move_line_get of account_anglo_saxon, we loop on the result of super call for each lines (n * n times) to compute the price difference.
The product_id was used to match the returned line and the original invoice line. This was wrong as we could get several lines with the same product_id (and then get n * n price difference lines).
This patch adds the line id to the result of move_line_get (from account) so that account_anglo_saxon can filter more efficiently and only get one price difference per invoice line.
Fixes #704
2014-08-12 17:30:49 +02:00
Denis Ledoux 81a902a07d [MERGE] forward port of branch 7.0 up to 5f696ba 2014-08-08 16:18:35 +02:00
Martin Trigaux 1d826a6051 [FIX] account_anglo_savon: round prices according to account precision to avoid getting unbalanced move
The standard move_line_get from account.invoice returns prices rounded (price_subtotal field as account precision) while the anglo-saxon module could return dict with non-rounded prices.
With amounts with bigger precision, we could get a difference of a few cents when comparing the debit/credits and then not be able to balance the invoice (opw 597208).
2014-08-08 14:04:46 +02:00
Launchpad Translations on behalf of openerp a2536d5e32 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140427061844-eycgmbqvphlakiz3
2014-04-27 06:18:44 +00:00
Denis Ledoux 2b2153bc39 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9991 revid:dle@openerp.com-20140417110435-u8uwwcf5ji1b54ao
bzr revid: dle@openerp.com-20140417112655-eeaiokbqzokpwx4i
2014-04-17 13:26:55 +02:00
Ravi Gohil (OpenERP) d36efd77eb [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408)
lp bug: https://launchpad.net/bugs/1304195 fixed

bzr revid: rgo@tinyerp.com-20140415094723-hly42ii5c8hdcnw4
2014-04-15 15:17:23 +05:30
Ravi Gohil (OpenERP) 8f59d71f3a [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408)
bzr revid: rgo@tinyerp.com-20140415092608-hplfg4ftsuxhu7rh
2014-04-15 14:56:08 +05:30
Ravi Gohil (OpenERP) 4a8168a7dc [FIX] account_anglo_saxon: Enabled the multi-currency support for price diff calculation. (Maintenance Case: 606408)
bzr revid: rgo@tinyerp.com-20140415091428-az1rx5ngz79j4fh6
2014-04-15 14:44:28 +05:30
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
Denis Ledoux ede8d04028 [FIX] account_anglo_saxon: tests, accounts on which reconciliations are done must have reconcile field set to True
bzr revid: dle@openerp.com-20140114201834-2ul27pur66701un4
2014-01-14 21:18:34 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Thibault Delavallée 2488f78e6d [FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah)
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
2014-01-02 14:30:28 +01:00
Thibault Delavallée c243854aae [FIX] account_anglo_saxon: fixed yml tests using an hardocded year instead of the current year.
bzr revid: tde@openerp.com-20140102124143-m1qv8koovjcl8mah
2014-01-02 13:41:43 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Martin Trigaux 81b3203dd7 [FIX] account_anglo_saxon: at invoice validation, the price for the analytic lines should be computed using the price_unit of the related stock.move instead of the product standard price (useful if different valuation method, could have price difference between delivery and invoice time)
bzr revid: mat@openerp.com-20131205163406-3rvupbbj3sm9q550
2013-12-05 17:34:06 +01:00
Launchpad Translations on behalf of openerp 6fd5575930 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
2013-11-27 05:39:57 +00:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Launchpad Translations on behalf of openerp 2160342cea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Thibault Delavallée 5bb4fa2b43 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
Launchpad Translations on behalf of openerp 2f3c517054 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026060436-zq7lmz0wyaf2or7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131022044413-i5f1hxr3y23buz38
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023043450-hbi0snv6o0qpl0ne
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026054646-gklydoly8cq62jbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027055002-ldfxtxmdm5wpc65b
2013-10-27 05:50:02 +00:00
Christophe Matthieu 5f7cbf6ad5 [FIX] account_anglo_saxon: inherit view of product use field and not xpath.
bzr revid: chm@openerp.com-20131015085537-dv70k245v01crptn
2013-10-15 10:55:37 +02:00
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Quentin (OpenERP) 84a134c46d [FIX] account_anglo_saxon: backport of revision 8787 of trunk
bzr revid: qdp-launchpad@openerp.com-20130710215655-5ym1u4ecsmqdw30n
2013-07-10 23:56:55 +02:00
Quentin (OpenERP) ea03ed65b6 [FIX] purchase, accont_anglo_saxon: fixed the creation of invoice from PO lines so that it reuse the _prepare_inv_line() method. This code factorization is needed in order to work with account_anglo_saxon module (before the anglo saxon accounting mode was ignored if the PO's invoicing method was 'generate invoices from PO lines')
bzr revid: qdp-launchpad@openerp.com-20130624090741-eyy2r22yuti0gqit
2013-06-24 11:07:41 +02:00
Quentin (OpenERP) d856e8361b [REF] *: change linked to server revision 4907. Removed deprecated 'view_load' attribute + removed duplicated first argument of property fields which is replaced with 'relation' argument in case where it is really needed (relational fields): indeed this first argument was totally useless for property of float type (for example).
bzr revid: qdp-launchpad@openerp.com-20130624090515-12aeo4k5sz87veqb
2013-06-24 11:05:15 +02:00
Quentin (OpenERP) 7e8e2ca75f [FIX] account_anglo_saxon: fixed the computation of price difference inc costing method != 'standard' + added yaml test for the same feature
bzr revid: qdp-launchpad@openerp.com-20130624090329-o423720dp3oc4aez
2013-06-24 11:03:29 +02:00
Quentin (OpenERP) e35a395968 [MERGE] account_anglo_saxon: added yaml test + doc files
bzr revid: qdp-launchpad@openerp.com-20130617081318-q66eeaygeuv3znc0
2013-06-17 10:13:18 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony b4976938d2 [MERGE] [I18N] Many translation bugfixes + resync of translation templates with latest source
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130607194733-27oiskc6q4fnp476
2013-06-07 21:47:33 +02:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
Randhir Mayatra (OpenERP) 66293ed61a [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20130607131809-iw2q151jg8kvbw2m
2013-06-07 18:48:09 +05:30
Randhir Mayatra (OpenERP) ff64d5a524 [IMP] add prefix 'X' to the accounts code
bzr revid: rma@tinyerp.com-20130422072123-cfs5omrcaei3jj9o
2013-04-22 12:51:23 +05:30
Randhir Mayatra (OpenERP) 86599716fe [IMP] change category
bzr revid: rma@tinyerp.com-20130419083515-jpt2a129nfg0evho
2013-04-19 14:05:15 +05:30
Randhir Mayatra (OpenERP) 7eed566dd0 [IMP] improve codes
bzr revid: rma@tinyerp.com-20130419081438-om4wrtfpcs9dha0u
2013-04-19 13:44:38 +05:30