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
65936 Commits
Author SHA1 Message Date
Christophe Matthieu cf15dfb490 [FIX] website_blog: Customize: Author 
bzr revid: chm@openerp.com-20140113150859-cmj22j72syvosmmg
 2014-01-13 16:08:59 +01:00
Fabien Meghazi 4c4755ffae [ADD] redirect option to /web/login 
bzr revid: fme@openerp.com-20140113143702-20j30wc3wuglp3mn
 2014-01-13 15:37:02 +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
Thibault Delavallée cbbe82a4a1 [MERGE] Sync with main website-al branch 
bzr revid: tde@openerp.com-20140113134937-kijvjjne6grov61c
 2014-01-13 14:49:37 +01:00
Gery Debongnie e2bb629c3c [IMP] adds support for various intervals when grouping by date in graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140113133800-3n1hi5ajpioktr3d
 2014-01-13 14:38:00 +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
Thibault Delavallée b97727701c [IMP] [ADD] website: added base for template designer. 
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
 2014-01-13 13:55:34 +01:00
Frédéric van der Essen 539ebab188 [FIX] hw_escpos: last commit didn't work as intended, reverting changes 
bzr revid: fva@openerp.com-20140113125325-9bodx8qrc0q7qgca
 2014-01-13 13:53:25 +01:00
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
Denis Ledoux 9a93675d2d [FIX] project: projects_ids default value must be an array or none, not a lonely integer 
bzr revid: dle@openerp.com-20140113113015-fobrv940bjhw1g7z
 2014-01-13 12:30:15 +01:00
ddm@openerp.com f319a68196 [IMP] requestd by fp: load correct HTML template 
bzr revid: ddm@openerp.com-20140113112514-qg43scqeryaha4nf
 2014-01-13 12:25:14 +01:00
Martin Trigaux 7078d1c36a [MERGE] sync with trunk 
bzr revid: mat@openerp.com-20140113112336-1dg6zz86g24yiicq
 2014-01-13 12:23:36 +01:00
Frédéric van der Essen a8262eb44f [FIX] hw_escpos: use pip module name for external dependencies 
bzr revid: fva@openerp.com-20140113110705-3qob6gdpir3f3rfb
 2014-01-13 12:07:05 +01:00
Christophe Matthieu f927506bfc [FIX] website_mail: follow/subscribe button 
bzr revid: chm@openerp.com-20140113110542-jkb13xfiy3tno50n
 2014-01-13 12:05:42 +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
Frédéric van der Essen 8a43a64250 [MERGE] better management for python dependencies of the hardware driver modules 
bzr revid: fva@openerp.com-20140113105447-4ylwptc139oho2m6
 2014-01-13 11:54:47 +01:00
Frédéric van der Essen 310807b286 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140113105344-285tkvqrnmza0awn
 2014-01-13 11:53:44 +01:00
Mahendra Barad (OpenERP) 6b90f0a6d5 [IMP]fix typo and improved layout 
bzr revid: mba@tinyerp.com-20140113103617-vu9hftagrqx0dqa2
 2014-01-13 16:06:17 +05:30
Martin Trigaux fb6f7b406d [IMP] project: remove duplicated field complete_name (already present in account.analytic.account) 
bzr revid: mat@openerp.com-20140113103245-md9rl0hsym79abdq
 2014-01-13 11:32:45 +01:00
Frédéric van der Essen 0b580af49b [FIX] hw_scanner: made evdev dependency optional (obviously it won't work if it's not installed...) 
bzr revid: fva@openerp.com-20140113103148-2uvhd7de6i9o40kx
 2014-01-13 11:31:48 +01:00
Fabien Meghazi bf26965d9f [ADD] login container 
bzr revid: fme@openerp.com-20140113102838-7q3tegun1p51u6s4
 2014-01-13 11:28:38 +01:00
Frédéric van der Essen f72044585a [FIX] hw_escpos: removed PIL external dependency as it is already required by openerp 
bzr revid: fva@openerp.com-20140113101520-meh1tswxn2eg11ge
 2014-01-13 11:15:20 +01:00
Frédéric van der Essen b897920b5a [FIX] hw_escpos: added pyserial, pyqrcode & PIL as external dependencies of the module, to prevent it from being installed if they aren't available 
bzr revid: fva@openerp.com-20140113100418-v08gb20ayy7eeogm
 2014-01-13 11:04:18 +01:00
Gery Debongnie 58598420fc [FIX] changes xml definition of the dropdown menu in graph view so that it nows corractly selects the chart mode (addon web_graph) 
bzr revid: ged@openerp.com-20140113094858-ykasko5a1i0gpyj3
 2014-01-13 10:48:58 +01:00
Frédéric van der Essen 59ba2bf90b [FIX] hw_escpos: added pyusb as an external dependency of the module, to prevent it from being installed without pyusb available 
bzr revid: fva@openerp.com-20140113094418-m6727xev0kt7bgk8
 2014-01-13 10:44:18 +01:00
Thibault Delavallée 778de23d6f [IMP] email_template: body_html is now an html file, not a text file anymore. 
Now that tools.mail.html_sanitize() has been detroyed, there is
no need anymore to keep this field as a text field.

bzr revid: tde@openerp.com-20140113092440-je3vpgohvljukjmn
 2014-01-13 10:24:40 +01:00
Frédéric van der Essen bee7a6d4f3 [FIX] point_of_sale: removed useless escpos python module & pyusb from hw_proxy module 
bzr revid: fva@openerp.com-20140113092322-qa8v4qhr4qo2kouc
 2014-01-13 10:23:22 +01:00
Frédéric van der Essen 9dd30a1815 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140113090646-4o165k3l1hbeogit
 2014-01-13 10:06:46 +01:00
Christophe Matthieu 2d2d047a61 [FIX] payment_aquirer_paypal: remove wrong field paypal_tx_url in demo data 
bzr revid: chm@openerp.com-20140113083846-6z0t1iazvi2an5s5
 2014-01-13 09:38:46 +01:00
Christophe Matthieu b1a422a9dc [FIX] event_sale: demo data 
bzr revid: chm@openerp.com-20140113083246-qypjeukv1kf5rrjf
 2014-01-13 09:32:46 +01:00
Christophe Matthieu d51ebda9fc [FIX] decimal.precision: add access right for decimal_precision_test 
bzr revid: chm@openerp.com-20140113082341-u13c2oc3c0xev8ar
 2014-01-13 09:23:41 +01:00
Gery Debongnie 0c24b69db2 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
 2014-01-13 09:10:30 +01:00
Gery Debongnie d04c788f2e [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140113081007-sw0hkl7ps5y2in9g
 2014-01-13 09:10:07 +01:00
Gery Debongnie c0c686cd15 [FIX] changes test definition to have the correct number of assertions (addon web) 
bzr revid: ged@openerp.com-20140113080856-7h6cnlh675vgi8s2
 2014-01-13 09:08:56 +01:00
Launchpad Translations on behalf of openerp fa02a0a2e7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111054551-r144q2z5chu41e2t
 2014-01-11 05:45:51 +00:00
Denis Ledoux 74e0fbae83 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn 
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
 2014-01-10 18:40:38 +01:00
Denis Ledoux fba491fb21 [FIX] decimal_precision: signal workers to restart their registry when decimal precision change. 
bzr revid: dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
 2014-01-10 18:38:23 +01:00
Frédéric van der Essen bf792a2fd6 [MERGE] point_of_sale: big point of sale upgrade for posbox campaign 
bzr revid: fva@openerp.com-20140110172410-ao0le042o8h9enha
 2014-01-10 18:24:10 +01:00
Frédéric van der Essen 4165921640 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140110172323-35agisgr341hzc3b
 2014-01-10 18:23:23 +01:00
Frédéric van der Essen a97a587fad [IMP] point_of_sale: posbox automatic discovery 
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
 2014-01-10 18:17:46 +01:00
jke-openerp 656f8241d5 [REF] Refactoring according to the first review of CHS 
bzr revid: jke@openerp.com-20140110170912-im9p7j5wf229k4d6
 2014-01-10 18:09:12 +01:00
jke-openerp 4d728f85dc [IMP] Improve according first review CHS 
bzr revid: jke@openerp.com-20140110170333-vkvhw7zon9h2qw6n
 2014-01-10 18:03:33 +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
Launchpad Translations on behalf of openerp 2a5a05f49d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140114064936-uengc20ppbqnn5ut
 2014-01-14 06:49:36 +00:00
Martin Trigaux cc553cc507 [FIX] format: trying to format an undefined value as the same effect as a value to false or infinity: return value_if_empty parameter 
bzr revid: mat@openerp.com-20140113172347-00anf6lh2jxin84w
 2014-01-13 18:23:47 +01:00
Denis Ledoux fb7aefa5c3 [FIX] hr_timesheet_invoice: on_change_partner_id, do nothing if partner_id is False 
bzr revid: dle@openerp.com-20140113165647-152dy1wqgc7m8cc8
 2014-01-13 17:56:47 +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
Gery Debongnie 98bd9a3fc3 [FIX] the SearchQuery.add methods now properly removes the 'at' and 'merge' keys before propagating options, so the tests should now pass (addon web) 
bzr revid: ged@openerp.com-20140110154812-kazqirnie3kwtl4m
 2014-01-10 16:48:12 +01:00
Martin Trigaux fd9d8b9ff3 [FIX] mrp: move _prepare_order_line_procurement to module sale_mrp as mrp module does not depends from sale 
bzr revid: mat@openerp.com-20140110153133-qozwrixyrwxjr44n
 2014-01-10 16:31:33 +01:00