Denis Ledoux
3d4b82cd56
[MERGE] forward port of branch 7.0 up to 9cc54dc
2014-10-01 12:41:42 +02:00
Martin Trigaux
937fb4aa11
[FIX] hr_expense: computation of tax/base amount
...
When computing the amount for a tax (included) with children, accumulate the included taxes to avoid taking only the last one (opw 614867).
2014-09-30 16:06:07 +02:00
Christophe Simonis
fdc62713a5
[MERGE] forward port of branch 7.0 up to 9b1cdea
2014-09-12 17:28:55 +02:00
Martin Trigaux
bf9a3723c0
[FIX] hr_expense: tax amount computation
...
The tax_amount field should contain the basic amount (without tax) for base tax code. (opw 613470)
2014-09-11 13:50:16 +02:00
Denis Ledoux
e447a46ec8
[MERGE] forward port of branch 7.0 up to 33e0910
2014-09-09 18:02:30 +02:00
Martin Trigaux
33e0910841
[FIX] hr_expense: tax included computation
...
When a tax included has a several childs, the source line should not be duplicated for each tax.
Without the patch, the actual product price (without taxes) would be (total - tax amount) for the last tax only (and not the sum of each tax). (opw 609104)
2014-09-09 15:57:35 +02:00
Denis Ledoux
c2ba11e72e
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
...
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Amit Dodiya (OpenERP)
004e983497
[FIX] hr_expense: journal entries should set posted state if journal has Skip Draft State for Manual Entries is checked
...
bzr revid: ado@tinyerp.com-20140210131514-480wqb4m34getdp9
2014-02-10 18:45:14 +05:30
Christophe Simonis
3fa90321e1
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
...
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Denis Ledoux
546a191f0a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
...
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Yannick Vaucher
90999af991
[FIX] hr_expense - merge 2 declarations of method copy for hr_expense_expense
...
lp bug: https://launchpad.net/bugs/1219691 fixed
bzr revid: yannick.vaucher@camptocamp.com-20130902093234-fyfytwjzexnzc9s3
2013-09-02 11:32:34 +02:00
Thibault Delavallée
bf4ada34b4
[REF] mail_thread: message_track now uses browse records instead of read results.
...
Updated addons accordingly.
Updated tests to test corner cases using False / null browse records.
bzr revid: tde@openerp.com-20130627144647-swbj77i84vo9ii0v
2013-06-27 16:46:47 +02:00
Thibault Delavallée
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Quentin (OpenERP)
5bf349766b
[FIX] hr_expense: 1) added a 'paid' status on hr.expense. 2) don't copy the account_move on duplication of an hr.expense
...
bzr revid: qdp-launchpad@openerp.com-20130522174945-02smgv1jpheo3zcc
2013-05-22 19:49:45 +02:00
Quentin (OpenERP)
9fc3014e11
[FIX] hr_expense: fix in accounting entries generation for tax included in price
...
bzr revid: qdp-launchpad@openerp.com-20130522094017-b6xibz6b90s4w091
2013-05-22 11:40:17 +02:00
Quentin (OpenERP)
dde76536dd
[IMP] hr_expense: added store={..} on total amount field of hr.expense
...
bzr revid: qdp-launchpad@openerp.com-20130418123145-62xp6tzxom3lbcqw
2013-04-18 14:31:45 +02:00
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Thibault Delavallée
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Quentin (OpenERP)
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Quentin (OpenERP)
e7c13b1a3b
[FIX] hr_expense: was crashing if a tax without 'tax_collected_id' field was used at the time of accounting entries creation
...
bzr revid: qdp-launchpad@openerp.com-20130404164153-0tbni96scijq90fu
2013-04-04 18:41:53 +02:00
Quentin (OpenERP)
f01f6e072c
[FIX] hr_expense: raised errors when an account is missing for the accounting entries generation
...
bzr revid: qdp-launchpad@openerp.com-20130327101549-jefamzxljupbrte9
2013-03-27 11:15:49 +01:00
Quentin (OpenERP)
a4926b070b
[FIX] hr_expense: removal of references to account_voucher module
...
bzr revid: qdp-launchpad@openerp.com-20130314150332-uifxmj2h2z4k2w28
2013-03-14 16:03:32 +01:00
Quentin (OpenERP)
be05b374a1
[MERGE] forwardport of bugfixes made in v7 up to revision 8854.
...
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Quentin (OpenERP)
836051d2ab
[MERGE] hr_expense now creates an account.move directly instead of a voucher
...
bzr revid: qdp-launchpad@openerp.com-20130313143726-3fdcbdiixiotih6c
2013-03-13 15:37:26 +01:00
Quentin (OpenERP)
37092931bf
[REF] hr_expense: code review and refactoring
...
bzr revid: qdp-launchpad@openerp.com-20130313124409-o24d2m1jlead1i3x
2013-03-13 13:44:09 +01:00
Quentin (OpenERP)
eb75755d72
[FIX] hr_expense: use the good partner_id at the creation time of accounting entries
...
bzr revid: qdp-launchpad@openerp.com-20130307095031-z3hbazdqugv18ryh
2013-03-07 10:50:31 +01:00
Quentin (OpenERP)
311bfac7fb
[FIX] hr_expense: generate accounting entries when there was no product was crashing
...
bzr revid: qdp-launchpad@openerp.com-20130307094958-j0x8zshu665q1vlf
2013-03-07 10:49:58 +01:00
Vishmita Jadeja (openerp)
96040bfd01
[IMP]add related fields
...
bzr revid: vja@tinyerp.com-20130307084530-bsvtnfd0bqgbj56u
2013-03-07 14:15:30 +05:30
Quentin (OpenERP)
0b2fa6275c
[FIX] hr_expense: open the account.move from the expense
...
bzr revid: qdp-launchpad@openerp.com-20130306171736-32gq9iyshvcpiddg
2013-03-06 18:17:36 +01:00
Quentin (OpenERP)
fd54f58ccb
[IMP] hr_expense: now propose to open the account.move in form view thanks to a button in the expense form view
...
bzr revid: qdp-launchpad@openerp.com-20130306163931-609cgn16xmcr0wot
2013-03-06 17:39:31 +01:00
Quentin (OpenERP)
ee72f0953a
[FIX] hr_expense: typo
...
bzr revid: qdp-launchpad@openerp.com-20130306143837-gc7edztg71h5hi56
2013-03-06 15:38:37 +01:00
Quentin (OpenERP)
cdabf79cf2
[REF] hr_expense, creation of accounting entries from hr.expense: a lot of code refactoring. Still a huge work to be done in order to factorize some code with other objects (like account.invoice, account.voucher, account.asset...)
...
bzr revid: qdp-launchpad@openerp.com-20130306140554-fhs6fhkyb779t6re
2013-03-06 15:05:54 +01:00
Josse Colpaert
804bc3a916
[FIX] in case of no taxes
...
bzr revid: jco@openerp.com-20130304155550-g5m12ryt6id0b3m3
2013-03-04 16:55:50 +01:00
Josse Colpaert
1e3725b9e6
[FIX] adjust tests and no taxes when product not available
...
bzr revid: jco@openerp.com-20130304144722-y30nkmmd8hyby7x0
2013-03-04 15:47:22 +01:00
Josse Colpaert
f08bf5a08e
[FIX] Generates journal items immediately from expense
...
bzr revid: jco@openerp.com-20130304135329-v1dfw564svd0zv7q
2013-03-04 14:53:29 +01:00
Vishmita
b69f12c596
[IMP]Improve code
...
bzr revid: vja@tinyerp.com-20130225072320-oee4rl1gq0xus18h
2013-02-25 12:53:20 +05:30
ggh-openerp
b4a5c9a820
[IMP] improve the code not total under the list group_by now add a total Expenses
...
bzr revid: ggh@tinyerp.com-20130218073741-wlc2ii9bx8hewcqt
2013-02-18 13:07:41 +05:30
Tejas Tank
f63497e12f
[IMP] hr_expense: cleanup the code for workflow declaration.
...
bzr revid: tta@openerp.com-20130131130650-szwdnjyqiohdimio
2013-01-31 18:36:50 +05:30
Quentin (OpenERP)
d79a4b1028
[FIX] hr_expense: removing the automatic validation of the supplier account.voucher when the hr.expense is set to 'done'
...
bzr revid: qdp-launchpad@openerp.com-20130107112933-tkuqrbhdxi4hhjsv
2013-01-07 12:29:33 +01:00
Quentin (OpenERP)
9e580d355b
[IMP] hr_expense: raise an error when no journal can be found at the time of the expense accounting entries creation
...
bzr revid: qdp-launchpad@openerp.com-20121221144945-gy67wln705ewgkxw
2012-12-21 15:49:45 +01:00
Thibault Delavallée
e3c31cab9e
[IMP] track_visibility atribute: moved onto explicit strings.
...
bzr revid: tde@openerp.com-20121220114730-nip8qaaajr5mqw6s
2012-12-20 12:47:30 +01:00
Thibault Delavallée
cd290565a4
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
Fabien Pinckaers
065821dfd6
[MOD] use read() instead of browse
...
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
Olivier Dony
03b6acd13d
[MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
...
It makes the code a little more straightforward and does not hurt.
bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Thibault Delavallée
8e0c7f9781
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121218181852-j9qg1po5y4yw67ko
2012-12-18 19:18:52 +01:00
Olivier Dony
fc0c2942ba
[MERGE] Another batch of bugfixes from 6.1
...
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
Thibault Delavallée
1efb2d6b0b
[REF] Hr_expense: added track on state, _track for subtypes, removed extra chatter messages.
...
bzr revid: tde@openerp.com-20121218165708-iij5o20k78m4xyax
2012-12-18 17:57:08 +01:00
Thibault Delavallée
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
Olivier Dony
84d7987f33
[MERGE] Bugfixes from 6.1 until revision 6900
...
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv
bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00