Commit Graph

288 Commits

Author SHA1 Message Date
Josse Colpaert dba6e07ecd [FIX] Will take into account the type of the invoice for the default account in the invoice line
lp bug: https://launchpad.net/bugs/1084819 fixed

bzr revid: jco@openerp.com-20121221094147-mp7dhttfob7y2xis
2012-12-21 10:41:47 +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 33ea9c9f73 [CLEAN] account, account_voucher: updated subtypes, removed dead code and unnecessary chatter message.
bzr revid: tde@openerp.com-20121219130024-bmf584gyw5p8khrc
2012-12-19 14:00:24 +01:00
Thibault Delavallée 8806ee77ca [FIX] account: fixed crash when evaluating some subtypes because of unread field. Modified tracked (old name) to track_visibility. Added description on subtypes of account.
bzr revid: tde@openerp.com-20121219121520-riwt9w52ntsa9dhm
2012-12-19 13:15:20 +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
Rajesh Prajapati (OpenERP) c9f803ff74 [IMP] Account : changed terms as suggested in account module
bzr revid: rpr@tinyerp.com-20121219065645-1cffyp8i4lqi083o
2012-12-19 12:26:45 +05:30
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
Fabien Pinckaers 41f7f27881 [IMP] several subtype fixes
bzr revid: fp@tinyerp.com-20121218220617-d6ebdlkf1facw4x8
2012-12-18 23:06:17 +01:00
Olivier Dony 72387cef3b [MERGE] account: cleanup refund creation + ease inheritance, courtesy of Benoit Guillot, Akretion
bzr revid: odo@openerp.com-20121218184210-kscqaid9vj0fman4
2012-12-18 19:42:10 +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
Olivier Dony 2eb26fb107 [MERGE] account: cleanup refund creation + ease inheritance, courtesy of Benoit Guillot, Akretion
bzr revid: odo@openerp.com-20121218174225-vheaos3zxh2q578l
2012-12-18 18:42:25 +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
Thibault Delavallée 2dbe4a696e [MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
2012-12-18 10:32:41 +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
Cecile Tonglet a3939acfa5 [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Thibault Delavallée 6d2a0d270f [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-tracked-fields-chs, with some selective choices.
bzr revid: tde@openerp.com-20121217095510-8upbg071esk5hlk1
2012-12-17 10:55:10 +01:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Sanjay Gohel (Open ERP) 510af53747 [MERGE]with trunk
bzr revid: sgo@tinyerp.com-20121210050956-qie5jf94xvgogiaq
2012-12-10 10:39:56 +05:30
Foram Katharotiya (OpenERP) 955f2588a2 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
Olivier Dony e7b30b164e [MERGE] Another batch of Bugfixes from 6.1
Up to 6.1 revision 6800 olt@tinyerp.com-20120516065727-ghvzjttnncj8ryj0

bzr revid: odo@openerp.com-20121207183024-adx8vnq9cytxi2lu
2012-12-07 19:30:24 +01:00
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +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
Foram Katharotiya (OpenERP) 5b3584a4a9 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121206045512-qn4wk0l1b73nearm
2012-12-06 10:25:12 +05:30
Sanjay Gohel (Open ERP) 7cabef4ffc [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121206044511-k9xe8jbchif7i3qh
2012-12-06 10:15:11 +05:30
Olivier Dony 0e407362e8 [MERGE] account.invoice: cleanup useless code, courtesy of Raphaël Valyi (Akretion)
bzr revid: odo@openerp.com-20121205112853-3kktg1r7bp82vwam
2012-12-05 12:28:53 +01:00
Olivier Dony 3d7eb0a71f [FIX] account: incorrect on_change methods result in invalid final unit price
lp bug: https://launchpad.net/bugs/938728 fixed

bzr revid: odo@openerp.com-20121205094045-mhv7kp0dx2ptp5ui
2012-12-05 10:40:45 +01:00
Foram Katharotiya (OpenERP) c300280eff [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121205053732-s966xh7rx0nwajsm
2012-12-05 11:07:32 +05:30
Sanjay Gohel (Open ERP) 8b26c71ce6 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121205051641-8cnalvjo2yd8ilz0
2012-12-05 10:46:41 +05:30
Raphaël Valyi cb7e38d212 [REF][account] no brainer removal of useless code in invoice onchange_partner_id
bzr revid: rvalyi@gmail.com-20121204194831-i5d8uxdqrhtlqjon
2012-12-04 17:48:31 -02:00
Quentin (OpenERP) 966890c540 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121204103146-9mfmx56ulfxrlphj
2012-12-04 11:31:46 +01:00
Quentin (OpenERP) f231b5b5f6 [MERGE] staging branch with misc fixes in accounting
bzr revid: qdp-launchpad@openerp.com-20121204091014-89ck1ditngl1u12c
2012-12-04 10:10:14 +01:00
Sanjay Gohel (Open ERP) c91da1fb35 [MERGE]merge with latest trunk
bzr revid: sgo@tinyerp.com-20121203132425-umzbdj5gm6m29b6c
2012-12-03 18:54:25 +05:30
Thibault Delavallée c3a3492848 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121203093454-lf21qlsuse1ve8ro
2012-12-03 10:34:54 +01:00
Fabien Pinckaers 1165abefc4 [IMP] followup
bzr revid: fp@openerp.com-20121130232837-mnp8cdlnsjpl6jeh
2012-12-01 00:28:37 +01:00
Quentin (OpenERP) a68e5f9041 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121130171130-dugntyqmjunwr20m
2012-11-30 18:11:30 +01:00
Quentin (OpenERP) 73c53b4071 [FIX] account_voucher: pay invoice propose the good partner (parent if not a company)
bzr revid: qdp-launchpad@openerp.com-20121130163528-zjjncja58hhnyflh
2012-11-30 17:35:28 +01:00
Quentin (OpenERP) e786a1675b [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130091824-e3xhak3k9z2anihv
2012-11-30 10:18:24 +01:00
Alexis de Lattre cad4abe56c Merge with addons/trunk revno 8168.
Adapt demo data to the rename of partner XML IDs in server/trunk.

bzr revid: alexis@via.ecp.fr-20121129222645-lm5ujxf4a1a83aoz
2012-11-29 23:26:45 +01:00
Quentin (OpenERP) 7a50367e84 [IMP] account: optimized the account invoice analysis report to lower the response time. Removed the fields due_delay and delay_to_pay that were the reasons of the bad performances besides being a bit useless and having wrong values computed
bzr revid: qdp-launchpad@openerp.com-20121129101228-6cxv07svxnbabfr0
2012-11-29 11:12:28 +01:00
Sanjay Gohel (Open ERP) 15182d3320 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121129052542-c3qqz5blh543f4dv
2012-11-29 10:55:42 +05:30
Quentin (OpenERP) 8dbdbf713f [FIX] account: pay_and_reconcile() function fixed as per new behavior (accounting entries are created for the parent company if needed)
bzr revid: qdp-launchpad@openerp.com-20121128111252-1m37zos11iwg9xyr
2012-11-28 12:12:52 +01:00
Sanjay Gohel (Open ERP) f630e0a338 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121128095512-t9v6p77jl54yai9p
2012-11-28 15:25:12 +05:30
Josse Colpaert f41866a703 [IMP] Adding Python tests
bzr revid: jco@openerp.com-20121127165317-v5rmrw5wvx6yykyr
2012-11-27 17:53:17 +01:00
Quentin (OpenERP) 928f7ecfe9 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121127134541-t16ham0o3k4xx0f8
2012-11-27 14:45:41 +01:00
Sanjay Gohel (Open ERP) 257bc28f47 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121127132410-97fdoscu8mhg7d6r
2012-11-27 18:54:10 +05:30
Quentin (OpenERP) 14c220cb9a [FIX] account: passing context in action_cancel() method of account.invoice. Fixing the runbot
bzr revid: qdp-launchpad@openerp.com-20121127122416-x9220fce3gbv2vr5
2012-11-27 13:24:16 +01:00
Fabien Pinckaers 85d1b074ae [FIX] account multi-company & crm log call
bzr revid: fp@tinyerp.com-20121126185249-6jrwoxvbhcu1ueqd
2012-11-26 19:52:49 +01:00
Josse Colpaert bf172d2959 [MERGE] merge from trunk
bzr revid: jco@openerp.com-20121126140054-0p35u0qd38k51w84
2012-11-26 15:00:54 +01:00
Hardik 98a1f3d3bc [IMP]Create customer invoice and select the customer without demo data
bzr revid: hsa@tinyerp.com-20121126113713-trqn1l2xlkxucnk3
2012-11-26 17:07:13 +05:30
Quentin (OpenERP) 02f55a72f7 [FIX] sale, account: fixed the invoicing flow for the following use case 'i make a SO for "joel@c2c", at the confirmation the invoice is sent to "accounting department@c2c" and finally the journal items created are for "c2c"'
bzr revid: qdp-launchpad@openerp.com-20121126092658-g981dg91gcjp1tvl
2012-11-26 10:26:58 +01:00
Amit Patel ebe7df0998 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121122092735-02chvlyvr1mkj8th
2012-11-22 14:57:35 +05:30
Sanjay Gohel (Open ERP) 0afceb9dbd [IMP]tracked sale project_issue and invoice fields
bzr revid: sgo@tinyerp.com-20121122062023-wzj8p4s0yj9gntep
2012-11-22 11:50:23 +05:30
Amit Patel b17dc2122d [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121122051032-wpk2r3a12v5jyknb
2012-11-22 10:40:32 +05:30
Olivier Dony 2c3d422964 [FIX] sale.order,invoices: more robust/consistent mechanism for marking documents sent after Send by Email
bzr revid: odo@openerp.com-20121121102137-9wukkbnfktfkg4lo
2012-11-21 11:21:37 +01:00
Amit Patel d756f85a2a [REM]:account:removed created from account
bzr revid: apa@tinyerp.com-20121121093200-hx4pi4vvk54vgn1x
2012-11-21 15:02:00 +05:30
Foram Katharotiya (OpenERP) af4d44d54f [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121121045400-g4yh2a5ut04k6bco
2012-11-21 10:24:00 +05:30
Quentin (OpenERP) 01985e9cdb [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121120141500-2wuk83zchrmstww2
2012-11-20 15:15:00 +01:00
Foram Katharotiya (OpenERP) 0dbf8e7d78 [IMP] add subtype in account
bzr revid: fka@tinyerp.com-20121120090657-2dhw9kew0425bjjj
2012-11-20 14:36:57 +05:30
Olivier Dony c558ac6272 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121114172252-q1xj3hdugqhky532
bzr revid: odo@openerp.com-20121115135141-ia8uf5649rapj0v7
2012-11-15 14:51:41 +01:00
Josse Colpaert 863b991fb4 [IMP] first changes after usabiliity review
bzr revid: jco@openerp.com-20121115081634-qz70ofb1cgftmn1e
2012-11-15 09:16:34 +01:00
Fabien Pinckaers e6586d1631 [FIX] wording
bzr revid: fp@tinyerp.com-20121114171920-pxyq9qp5vcjm79yc
2012-11-14 18:19:20 +01:00
Olivier Dony f5f6547fa7 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121113164544-21tmr4bmpt2n1mfl
2012-11-13 17:45:44 +01:00
Thibault Delavallée ea4eb01ac1 [FIX] sale, purchase, account: send by email button calls the mail.compose.message in comment mode.
bzr revid: tde@openerp.com-20121113112038-hwp41jldofq1al6k
2012-11-13 12:20:38 +01:00
Olivier Dony c9d5148991 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121107114202-mt3gny8e2497m7qf
2012-11-07 12:42:02 +01:00
Somesh Khare(OpenERP) f56a1333d8 [FIX]account : when you set option Skip Draft State for Manual Entries on sale journal invoice sequence number incremented
bzr revid: mma@tinyerp.com-20121105132852-fh2d5qvflqpnoseg
2012-11-05 18:58:52 +05:30
Olivier Dony 88dcca513f [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121024090615-zuh7aub6fhcwhy82
2012-10-24 11:06:15 +02:00
Olivier Dony 6fadb45325 [IMP] sale,purchase,invoice: make `Send by mail` action more robust to template/view deletion
bzr revid: odo@openerp.com-20121023115628-3wvxcrkgazhi9p75
2012-10-23 13:56:28 +02:00
Quentin (OpenERP) 8d40893e6f [IMP] account: added field supplier invoice number, as suggested by Normunds Vilcans
lp bug: https://launchpad.net/bugs/814128 fixed

bzr revid: qdp-launchpad@openerp.com-20121022103216-9rnvr84s62ugazny
2012-10-22 12:32:16 +02:00
Benoit Guillot 1e9d0c4904 [FIX] skip the one2many and the many2one fields in the invoice line and support invoice_line_tax_id
bzr revid: benoit.guillot@akretion.com.br-20121016162251-iwgwq6h1po9uinr8
2012-10-16 18:22:51 +02:00
Benoit Guillot 8ee703031a [IMP] use browse_record instead of dict for refund creation
bzr revid: benoit.guillot@akretion.com.br-20121012122406-7ghe5pazc430wtqm
2012-10-12 14:24:06 +02:00
Benoit Guillot f4ea0af205 [IMP] add docstring and fix refund_id arg. Add also a new prepare method _prepapre_cleanup_fields() to override the fields of the refund lines
bzr revid: benoit.guillot@akretion.com.br-20121010153724-rgjiluytvz3z7qju
2012-10-10 17:37:24 +02:00
Quentin (OpenERP) 5b6ae3b88e [FIX] sale, account: propagate the sequence from the sale order line to the invoice line
bzr revid: qdp-launchpad@openerp.com-20121008121745-2s1cavfy891hbf7s
2012-10-08 14:17:45 +02:00
Fabien Pinckaers c93d70e919 [MERGE] chm - improved subtype - fixes
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00
Antony Lesuisse cb287a1964 [MERGE] trunk
bzr revid: al@openerp.com-20120930141653-rm3miqkgxam9ko4i
2012-09-30 16:16:53 +02:00
Antony Lesuisse 6dd16f2613 [MERGE] trunk
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
Fabien Pinckaers 85cddaaef8 [FIX]
bzr revid: fp@tinyerp.com-20120930114525-beszrz8v3wck1uqf
2012-09-30 13:45:25 +02:00
Fabien Pinckaers 209e6df658 [FIX] taxes on invoices
bzr revid: fp@tinyerp.com-20120930105006-wz86m86zkz3w92kw
2012-09-30 12:50:06 +02:00
Fabien Pinckaers 0bebad7133 [MERGE] fix right company on multi-company timesheeets
bzr revid: fp@tinyerp.com-20120929132907-a618eqxz97jgnzoy
2012-09-29 15:29:07 +02:00
Fabien Pinckaers ca499861c9 [FIX] base tax computation rounding
bzr revid: fp@tinyerp.com-20120929130822-dc9gzgdx20vna0nr
2012-09-29 15:08:22 +02:00
Thibault Delavallée cb806332be [FIX] subtype_xml_id -> subtype in message_post.
bzr revid: tde@openerp.com-20120920145405-vwi1kt1ttkd2w8sz
2012-09-20 16:54:05 +02:00
Thibault Delavallée 84fbc3b7da [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
2012-09-20 16:49:00 +02:00
Fabien Pinckaers 5ffbf77067 [MERGE] fixes in account
bzr revid: fp@tinyerp.com-20120920092726-5747f5kj14u26sb1
2012-09-20 11:27:26 +02:00
Thibault Delavallée 10458eb098 [CLEAN] mrp_operation, analytic, account, account_voucher: cleaned subtypes.
bzr revid: tde@openerp.com-20120919133540-e0d8huak2g3v915o
2012-09-19 15:35:40 +02:00
Quentin (OpenERP) 62d16ecd3e [MERGE] staging branch with bugfixes + add of an option to enable the check total feature on supplier invoices
bzr revid: qdp-launchpad@openerp.com-20121029091713-z4vx02bzf9bswceu
2012-10-29 10:17:13 +01:00
Fabien Pinckaers a334d1ebea [MERGE] typo
bzr revid: fp@openerp.com-20121024201859-aljpjevofisrt9o3
2012-10-24 22:18:59 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Quentin (OpenERP) ff6966da8b [IMP] account: added an option to enable/disable the check_total feature on supplier invoices
bzr revid: qdp-launchpad@openerp.com-20121024091313-s6k3ekmsen5ntez4
2012-10-24 11:13:13 +02:00
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Mayur Maheshwari (OpenERP) 79a84ffc5d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121010051917-0ep6z3xy0ff92kzo
2012-10-10 10:49:17 +05:30
Divyesh Makwana (Open ERP) b30bd8da25 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121009042752-0om3u8ds9utyvqq1
2012-10-09 09:57:52 +05:30
Mayur Maheshwari (OpenERP) 9487c2d9ba [IMP]account : improve string
bzr revid: mma@tinyerp.com-20121008110549-zt946y9190avok3d
2012-10-08 16:35:49 +05:30
Divyesh Makwana (Open ERP) 9a264c3369 [IMP] There is no consistency throughout OpenERP with 'Source document', 'Source', 'Origin'. It should always be 'Source document'.
bzr revid: mdi@tinyerp.com-20121008104151-opvu1mig2xbxxpli
2012-10-08 16:11:51 +05:30
Sanjay Gohel (Open ERP) b6e298534c [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120913053647-12otf3bev3rap3l7
2012-09-13 11:06:47 +05:30
Sanjay Gohel (Open ERP) a807b57f4e [MERGE]merge with trunk addons
bzr revid: apa@tinyerp.com-20120911054811-24s3e1perqf7x1wo
bzr revid: apa@tinyerp.com-20120911084547-trlru6t8r1dv1yhd
bzr revid: apa@tinyerp.com-20120912050215-glxhb94pu2aed5fz
bzr revid: apa@tinyerp.com-20120913050959-re58fqvnaqrhgzg0
bzr revid: sgo@tinyerp.com-20120914053201-khnzm9ei7rpjcp7u
2012-09-14 11:02:01 +05:30
Sanjay Gohel (Open ERP) 6f0b8abe31 [IMP]account,project,project_issue: changed as per new spec
bzr revid: sgo@tinyerp.com-20120913053540-atfsrw8bkf16qo3t
2012-09-13 11:05:40 +05:30
Amit Patel e300d74b77 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20120912045846-2mmequiylooft1yf
bzr revid: apa@tinyerp.com-20120913051413-7wqfbgqmksobnueb
2012-09-13 10:44:13 +05:30
Thibault Delavallée 4ede1863d6 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120912080624-kip95tfjiectqexa
2012-09-12 10:06:24 +02:00
Thibault Delavallée f0a792c565 [FIX] purchase, account: updated call to mail.compose.message form view, using default values for the form.
bzr revid: tde@openerp.com-20120911141650-krnq836afvwmpln2
2012-09-11 16:16:50 +02:00