pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
9237 Commits
Author SHA1 Message Date
Launchpad Translations on behalf of openerp 4208281471 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
 2014-02-03 05:18:28 +00:00
Antony Lesuisse 4b30f1fcbd [MERGE] trunk-website-al 
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
 2014-01-31 01:51:57 +01:00
Gery Debongnie 9cdcf812a6 [MERGE] merge from trunk into local branch 
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
 2014-01-30 14:52:51 +01:00
Christophe Simonis c202dc1c52 merge upstream 
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
 2014-01-29 20:08:34 +01:00
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
Gery Debongnie 4b3076e955 [IMP] improves the reporting views in account module (work on the Pivot tables, and remove some useless day/month/year attributes) (addon account) 
bzr revid: ged@openerp.com-20140129160348-230nvcutbdqh1hx1
 2014-01-29 17:03:48 +01:00
Denis Ledoux a3b7279ff6 [FIX] account: set purchase analytic journal when creating purchase accounting journal 
bzr revid: dle@openerp.com-20140129140625-ywxraf0ix040a0b5
 2014-01-29 15:06:25 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk 
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
 2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v 
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
 2014-01-28 18:58:35 +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
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
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates 
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
 2014-01-27 17:09:46 +01:00
Gery Debongnie 939ae651b4 [IMP] improves the account invoice reporting view, in graph view mode : puts the period in column, product category in rows (addon account) 
bzr revid: ged@openerp.com-20140127082038-sek8wnkzwundrxe6
 2014-01-27 09:20:38 +01:00
Gery Debongnie ede4fd8861 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140124153531-f4ynl627jpssj7dx
 2014-01-24 16:35:31 +01:00
Thibault Delavallée 5d17667bb1 [RENAME] account_product_template -> product_email_template, to avoid 
confusion with product templates. The main feature are email template on product
therefore renaming the module.

bzr revid: tde@openerp.com-20140124110802-unn4u75ad4jt0bb2
 2014-01-24 12:08:02 +01:00
Thibault Delavallée c9260b90a8 [CLEAN] account_product_template: openerp and init files cleaning 
bzr revid: tde@openerp.com-20140124094514-o50cxzlm348p1vpc
 2014-01-24 10:45:14 +01:00
Thibault Delavallée 9c74cab9a5 [REVIEW] account: wording of the new config field 
bzr revid: tde@openerp.com-20140124093947-kbz534udanag4v14
 2014-01-24 10:39:47 +01:00
Thibault Delavallée 4f1423588c [IMP] account: res config view: added name on some div to ease the inheritance 
bzr revid: tde@openerp.com-20140123145210-mrtjpw85e38gz81c
 2014-01-23 15:52:10 +01:00
Thibault Delavallée 38d64147d5 [IMP] product: only template child / multiple template childs form view improvements 
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.

bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
 2014-01-22 10:58:26 +01:00
Turkesh Patel (Open ERP) 3cfea8434f [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20140121102549-5xtvx4emv4nrylky
 2014-01-21 15:55:49 +05:30
Darshan Kalola (OpenERP) 9ce241349f [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution. 
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
 2014-01-21 11:16:38 +05:30
Darshan Kalola (OpenERP) 69e88b3fec [] 
bzr revid: dka@tinyerp.com-20140117140940-kghgmrrndd82pheg
 2014-01-17 19:39:40 +05:30
Darshan Kalola (OpenERP) 5d770d4b6f [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts. 
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
 2014-01-16 20:23:07 +05:30
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
 2014-01-16 15:43:26 +01: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 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
Gery Debongnie be0da788f6 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140113110402-t4hmjl1vdqt91qx6
bzr revid: ged@openerp.com-20140113142408-12i6pqw1cbdqhqg2
 2014-01-13 15:24:08 +01:00
Turkesh Patel (Open ERP) 04703c9e15 [ADD] added account_product_template module and add it account configuration view 
bzr revid: tpa@tinyerp.com-20140113131845-urfw5knjkou0a0aw
 2014-01-13 18:48:45 +05:30
Martin Trigaux 1f163f5a78 [FIX] account: demo opening period, add x in the name 
bzr revid: mat@openerp.com-20140113122917-zszm18ywrel1ie68
 2014-01-13 13:29:17 +01:00
Martin Trigaux e0f4c59f11 [FIX] account: accounting periods in demo data are no longer opening periods, create a new period_0 as opening period 
bzr revid: mat@openerp.com-20140113105555-nuefln1bajgwexpd
 2014-01-13 11:55:55 +01:00
Olivier Dony cc5d5bb2bf [FIX] account: restore cross-account reconciliation check, disabled by mistake in v6.1 
Both the FY closing change and the removal of the
check occurred in v6.1 at revision 6529
revid:qdp-launchpad@openerp.com-20120209170333-8xu7r21hencjwu73.

Also removed code specific to fiscal year closing
in the regular reconciliation operation, as the
FY closing is now using a dedication reconciliation
algorithm.

This is a forward-port of the corresponding patch in v6.1,
at revno 7295 rev-id: odo@openerp.com-20140110154023-12rqfeuwx5fqpdau.

bzr revid: odo@openerp.com-20140110161519-qsocx6xgqsmbe6dt
 2014-01-10 17:15:19 +01:00
Martin Trigaux 892f1d5fe5 [MERGE] [FIX] account: fixed amount in foreign currency for opening entries 
When generating fiscal year opening entries, if the account uses a different currency, the amount_currency should contains only the entries of the current year and not the previous one. Courtesy of Matthieu Dietrich (camptocamp)

bzr revid: mat@openerp.com-20140113132209-jpva50a714xfxx30
 2014-01-13 14:22:09 +01:00
Launchpad Translations on behalf of openerp c2794d0e85 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
 2014-01-13 05:59:13 +00:00
Launchpad Translations on behalf of openerp ad17716632 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140109053828-gmi203xa8tx1nnnp
 2014-01-09 05:38:28 +00:00
Denis Ledoux 05aab83eb1 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e 
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
 2014-01-08 18:14:00 +01:00
Quentin (OpenERP) 81ac1302f6 [FIX] account: amount in secondary currency shouldn't be recomputed if 0 is given as value 
bzr revid: qdp-launchpad@openerp.com-20140108160444-v2noeye7ftl32jgi
 2014-01-08 17:04:44 +01:00
Darshan Kalola (OpenERP) a9e87b56ce [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
 2014-01-08 15:06:59 +05:30
Launchpad Translations on behalf of openerp dc7821ab8f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140108053808-kp6y8v47dolfbvup
bzr revid: launchpad_translations_on_behalf_of_openerp-20140108054028-juvi5k3459lfg0ov
bzr revid: launchpad_translations_on_behalf_of_openerp-20140108054034-xfyjwtdxhq3abo8c
 2014-01-08 05:40:34 +00:00
Martin Trigaux 56dc173361 [FIX] _auto_init: return a value to _auto_init calls. Backport of trunk revision 8679 
bzr revid: mat@openerp.com-20140107145142-zm48pcjvqp42cfjg
 2014-01-07 15:51:42 +01:00
Launchpad Translations on behalf of openerp 5ca4c267c4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140107052957-3zftpbu3yj88o16s
 2014-01-07 05:29:57 +00:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
 2014-01-06 14:57:00 +01:00
Gery Debongnie 223939d548 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140103154803-bgrq8nmkru39krzl
bzr revid: ged@openerp.com-20140106083918-fb1eojisumk08vr5
 2014-01-06 09:39:18 +01:00
Launchpad Translations on behalf of openerp b1af63310c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061324-aw7yvvnjapbx5x1i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053354-9ybfurq6yvrliqge
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054728-1db5iqqokg67bcyr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052619-5szmeohg88k0m4xt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054325-pww3zkiyzxll4qy7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054504-671epcsd8458kil8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062350-h5v8idg6hlix6rnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061853-bndte11d6k8po640
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054743-exo0ixnpjkfwfstl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050440-fme1x3f2g4s1dxqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062427-4v5wusiplrcj4jjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061934-r5xq4gfoy22w6nll
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054800-delmrxbtcvm3xxyw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050503-xu0r3lopkkfn20ca
 2014-01-06 05:05:03 +00:00
Thibault Delavallée 6389c33cd6 [IMP] account: when the period is not defined, raise a RedirectWarning instead of a simple warning. 
This allows to add a redirection button to the configuration panel
of fiscal years.

bzr revid: tde@openerp.com-20140103093610-p7u12yb03rkj81bk
 2014-01-03 10:36:10 +01:00
Thibault Delavallée 737be08fbf [MERGE] account: cash register view improvements 
- now looking like cash control methods from the point of sale module.

point of sale: improved some tooltips + cash control form view improvements

bzr revid: tde@openerp.com-20140102113009-lb1vv2w3g4dz2oqw
 2014-01-02 12:30:09 +01:00
Gery Debongnie 48b67ddf54 [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account) 
bzr revid: ged@openerp.com-20140102102341-bvdpp0ltlibkefei
 2014-01-02 11:23:41 +01:00
Gery Debongnie dddd0fec57 [IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon account) 
bzr revid: ged@openerp.com-20140102101605-6hlsx1d2jse7uggf
 2014-01-02 11:16:05 +01:00
Gery Debongnie ea2dcd79b1 [IMP] removes old tree view in reporting (invoice) and replaces it by the new graph view in pivot mode by default (addon account) 
bzr revid: ged@openerp.com-20140102100427-kk048mulsrhgnnbw
 2014-01-02 11:04:27 +01:00
Gery Debongnie 8135ef70f3 [IMP] removes old tree view in reporting (invoice) and replaces it by the new graph view in pivot mode by default (addon account) 
bzr revid: ged@openerp.com-20140102090022-mzjiiiwg6he3ggz5
 2014-01-02 10:00:22 +01:00