Commit Graph

1125 Commits

Author SHA1 Message Date
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Denis Ledoux f8d5ef0f80 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
Denis Ledoux 998b290409 [MERGE][FIX] account: while refuding the invoice with payment term journal items are created wrongly with write-off account
bzr revid: dle@openerp.com-20140415100702-s13cuejf89gtlnhc
2014-04-15 12:07:02 +02:00
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Simon Lejeune 106d06ce5d [IMP] account* reports: removed unused class/report/commented code/test, added the abstract_report wrapper on all old style report classes + some fixes on views and wizards in order to use these classes to render the qweb reports
bzr revid: sle@openerp.com-20140402164053-gry12scy8zca68lv
2014-04-02 18:40:53 +02:00
Christophe Simonis dfdbf8cdc4 [MERGE] forward port of branch saas-2 up to revid 9162 chs@openerp.com-20140401184913-5hi2h11lnmadbozr
bzr revid: chs@openerp.com-20140401190308-f3f2l9br69qb33ob
2014-04-01 21:03:08 +02:00
Christophe Simonis 822ef4a621 [MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr
2014-04-01 20:49:13 +02:00
Simon Lejeune c771903c3b [IMP] account* reports: removed rml, added qweb template, changed the wizard to return qweb actions
bzr revid: sle@openerp.com-20140327182520-uu7ezsqic30x7mqo
2014-03-27 19:25:20 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Dharti Ratani (Open ERP) b711318924 [IMP]Set the order of the sequence by date while posting journal entries from wizard Periodical Processing> Draft Entries> Post Journal Entries
bzr revid: dhr@tinyerp.com-20140320094600-7s0cfsn2yz5jr2e6
2014-03-20 15:16:00 +05:30
Kersten Jeremy 310bcc4d68 [IMP] Aged Partner Balance - Add selection in wizard to allow to choose the target_move. Customer was unable to make an aged balance with all payments move but only with the move validated.
bzr revid: jke@openerp.com-20140319143346-h3f4y77d736w5lc1
2014-03-19 15:33:46 +01:00
openerp-sle dd3122c050 [IMP] Taxes report converted to QWeb
bzr revid: openerp-sle@openerp-sle.home-20140213173910-w1srnhcyrwhrox1h
2014-02-13 18:39:10 +01:00
Sanjay Gohel (OpenERP) 77581e2a06 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20140210052655-efiwytz5kllk7irx
2014-02-10 10:56:55 +05:30
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Denis Ledoux 6ab1f8a4a4 [FIX] account: account reconciliation adding float rounding, to avoid having float precision problem
bzr revid: dle@openerp.com-20140128175042-a2e4ga47lqow86vj
2014-01-28 18:50:42 +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 899166ecac [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
2014-01-14 18:36:53 +01:00
Matthieu Dietrich 6fb32cc4d5 [FIX] lp:1257288 - fixed amount in foreign currency for opening entries
bzr revid: matthieu.dietrich@camptocamp.com-20131203144843-kbtd3atkryq8ryec
2013-12-03 15:48:43 +01:00
Quentin (OpenERP) 9bc8665d8a [MERGE] improvements of 'post entry' wizard in order to allow the selection of several journals and several periods. Courtesy of Alexis de Lattre (Akretion)
bzr revid: qdp-launchpad@openerp.com-20131127153257-9e4ajwqvrmbuvxrn
2013-11-27 16:32:57 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Martin Trigaux d23977c106 [IMP] account: revert wrong commit 9590 and set default value with customer refrence
bzr revid: mat@openerp.com-20131118165353-nbk1wwdri1dnl4wh
2013-11-18 17:53:53 +01:00
Martin Trigaux 4d105a27d6 [FIX] account: set customer reference for the invoice name (customer refrence) while refunding instead of reason of refund (opw 591713)
bzr revid: mat@openerp.com-20131118094951-o2ixt5xyrwlyvzgx
2013-11-18 10:49:51 +01:00
Sanjay Gohel (OpenERP) eb1a56cd91 [MERGE]merge and resolve conflicts
bzr revid: sgo@tinyerp.com-20131029133347-b22zkm0hgg3y9an3
2013-10-29 19:03:47 +05:30
Amit Dodiya (OpenERP) 65caa33162 [FIX] account: while refuding the invoice with payment term journal items are created wrongly with write-off account
bzr revid: ado@tinyerp.com-20131028124822-we80argd26aozxg7
2013-10-28 18:18:22 +05:30
Alexis de Lattre 0bd592bf64 [MERGE] merge with addons/trunk revno 8956
bzr revid: alexis@via.ecp.fr-20131027123104-tf61ztyztstbc9et
2013-10-27 13:31:04 +01:00
Denis Ledoux 274cf1e293 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Martin Trigaux f3ca1a0203 [IMP] account: remove wrong colspan on partner ledger wizard
bzr revid: mat@openerp.com-20130920130304-ntbaz1dkea0c5hpe
2013-09-20 15:03:04 +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
Martin Trigaux 39ccb90b91 [IMP] account: pass target_move in common report instead of only financial report
bzr revid: mat@openerp.com-20130903092732-4zs6g63jgo0jjayi
2013-09-03 11:27:32 +02:00
Martin Trigaux 108936286e [FIX] account: use field taget_move for generation of account financial report (all entires or all posted entries)
lp bug: https://launchpad.net/bugs/1078146 fixed
lp bug: https://launchpad.net/bugs/1135349 fixed

bzr revid: mat@openerp.com-20130902120450-k0gqnclqhgq8nbe6
2013-09-02 14:04:50 +02:00
Denis Ledoux 18193da769 [FIX]account: in wizard of refund, replace type(line.reconcile_id) != osv.orm.browse_null with simply if line.reconcile_id: + imp of the following line
bzr revid: dle@openerp.com-20130828155815-0i8uoez4guh0i85x
2013-08-28 17:58:15 +02:00
Sanjay Gohel (OpenERP) 726abe6978 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130822091616-ier8wwiss6zxfqma
2013-08-22 14:46:16 +05:30
Denis Ledoux a99b5786d1 [MERGE] Forward-port of 7.0 bugfixes up to rev. 9337 (dle@openerp.com-20130731153129-8hmqrgsg3e9d533f)
bzr revid: mat@openerp.com-20130726073123-6buqe3rg321gj5rw
bzr revid: odo@openerp.com-20130730110536-a74ea14pwb2y03ay
bzr revid: dle@openerp.com-20130801123703-frjhpeqwocsjo7ge
2013-08-01 14:37:03 +02:00
Martin Trigaux 87810e762d [FIX] account: select corresponding fiscal year when changing company on aged partner balance report, courtesy of Dawn Richardson
lp bug: https://launchpad.net/bugs/1185275 fixed

bzr revid: mat@openerp.com-20130726092134-axwqdopf1ampozcn
2013-07-26 11:21:34 +02:00
sgo@tinyerp.com a241bec4bf [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130722064546-5algtla91hpnaanb
2013-07-22 12:15:46 +05:30
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Dawn Richardson 53179028d5 [FIX] Ensures the fiscal year is correctly chosen based on the company of the selected chart of accounts within accounting reports. Particularly crucial for reports which do not allow the fiscal year to be manually selected (such as the aged partner balance, which is prone to simply throwing errors).
lp bug: https://launchpad.net/bugs/1185275 fixed

bzr revid: dawn@catalyst.net.nz-20130715025212-ncgog0hbixnci7qh
2013-07-15 14:52:12 +12:00
sgo@tinyerp.com 6edcb21cb8 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130620065402-084b1k96gep06i0m
2013-06-20 12:24:02 +05:30
Olivier Dony 138ff9cfd9 [MERGE] OPW 590139: account reports: several missing translation markers
The calls to _translate() do not actually work
in the Python helpers for the reports, unless the
terms are actually found in RML report source
(so translations of the right type exist).
Of course adding the terms in the RML directly
makes those helper methods redundant, so
they can now be removed in trunk.
Kept them in stable for API compatibility
only, they should work for existing reports.

lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130614213602-y325elmg3u5mq2qc
2013-06-14 23:36:02 +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
sgo@tinyerp.com fea1eaf1d6 [MERGE]sync with parent
bzr revid: sgo@tinyerp.com-20130610050015-cuk6adbhzsmaas8s
2013-06-10 10:30:15 +05:30
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
Christophe Matthieu 9d9e3d2ef8 [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
Christophe Matthieu 8c6ff33bef [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
Olivier Dony ffbd3e9b6c [MERGE] OPW 586535: account: properly translate the default name for opening entries
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130606151057-u3stejvky57jfmxr
2013-06-06 17:10:57 +02:00
sgo@tinyerp.com d3c7f6becf [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130605070737-5sdnhqzysi1lcnnj
2013-06-05 12:37:37 +05:30
Olivier Dony 0f983a0146 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
Martin Trigaux 56a3b528f5 [MERGE] [FIX]account:in cash register if we put or take money its generate traceback
bzr revid: mat@openerp.com-20130528133435-v4b99yxh3hi523he
2013-05-28 15:34:35 +02:00
Amit Bhavsar (Open ERP) 24848a8dcc [MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30