pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,803 Commits 1 Branch 0 Tags
cffcc5ea18c0a4004e13fec774110f6039b0034b
Commit Graph
76803 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gery Debongnie cffcc5ea18 [FIX] hopefully, properly uses the user's timezone when performing a readgroup (in orm.py) 
bzr revid: ged@openerp.com-20140129084721-6m4cfg087vhqb51d
 2014-01-29 09:47:21 +01:00
Gery Debongnie 2fe3861353 [FIX] uses the user's timezone when performing a readgroup (in orm.py) 
bzr revid: ged@openerp.com-20140128110022-j08khieyt1wvsr8e
 2014-01-28 12:00:22 +01:00
Gery Debongnie dde3f8479c [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140124153404-14x07mfr5s9lghid
bzr revid: ged@openerp.com-20140127133009-t8t29b3eu8ai5t8v
 2014-01-27 14:30:09 +01:00
Launchpad Translations on behalf of openerp 88db454a41 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125060316-85hljstv1k9mjqzt
 2014-01-25 06:03:16 +00:00
Gery Debongnie b2f27dabf0 [REF] implifies the read_group method by removing an useless dictionary (orm.py) 
bzr revid: ged@openerp.com-20140124132834-evx3dikqc94m48ed
 2014-01-24 14:28:34 +01:00
Thibault Delavallée e93a3b1880 [MERGE] [ADD] product_email_template new module. It allows ot send template-based emails when validating invoices. This allows to send description, user guides, technical datasheets, ... when selling products. 
product_template inheritance: added email_template_id field, link to an optional email.template

invoice inheritance: when validating the invoice, send an email for each product that has a linked email.template.

email_template inheritance: defined a new simplified form view with only attachment_ids and body, to ease the quick edition of email templates. This simplified form view is used for the email_template_id field on the product.template form view.

email_template: when having default_model in default_get, use it to prefetch model_id. Indeed model is a related file, we have to redirect its default to the right model_id field.

bzr revid: tde@openerp.com-20140124120652-vxp0jwf14sl1frme
 2014-01-24 13:06:52 +01:00
Thibault Delavallée b845b708af [CLEAN] email_template: cleaned code 
bzr revid: tde@openerp.com-20140124114743-m6s8d1byabl78l63
 2014-01-24 12:47:43 +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 c98acc4919 [CLEAN] account_product_template: cleaned demo data 
bzr revid: tde@openerp.com-20140124110510-k1czgon57idv4hct
 2014-01-24 12:05:10 +01:00
Thibault Delavallée e374abeba6 [FIX] account_product_template: handle attachments of the template. 
bzr revid: tde@openerp.com-20140124110012-lpf79nvmcqjhzuvv
 2014-01-24 12:00:12 +01:00
Thibault Delavallée 9478019191 [IMP] account_product_template: cleaned code of email sending. 
Now based on a composer, trigerring the onchange with the template, then
sending the email. This replicates the email sending with the composer using
a template.
TODO: fix attachments not being send

bzr revid: tde@openerp.com-20140124105406-09gndxy3izhdyq2n
 2014-01-24 11:54:06 +01:00
Thibault Delavallée 79b36c68ee [IMP] account_product_template: improved 
email template simplified form view

bzr revid: tde@openerp.com-20140124105214-i0fgxj2ibwgezqau
 2014-01-24 11:52:14 +01:00
Thibault Delavallée a5b8a1b3db [CLEAN] account_product_template: some cleaning for eadability 
bzr revid: tde@openerp.com-20140124105150-xg8r52n6vpxg807t
 2014-01-24 11:51:50 +01:00
Frédéric van der Essen 8bfc149e7b [MERGE] point_of_sale: further point of sale and hardware integration improvements 
bzr revid: fva@openerp.com-20140124105115-uxalr0xt52zzhd5t
 2014-01-24 11:51:15 +01:00
Thibault Delavallée 0d21e37728 [CLEAN] account_product_template: moved email sending into its own method. 
bzr revid: tde@openerp.com-20140124102201-dkh2n7odwxvg4lsv
 2014-01-24 11:22:01 +01:00
Thibault Delavallée b187d1873f [CLEAN] account_product_template: added help and docstrings in the product template inheritance 
bzr revid: tde@openerp.com-20140124102031-9gyq19ehxgtdvxxz
 2014-01-24 11:20:31 +01:00
Gery Debongnie 09706b5dff [IMP] adds 'W' in front of the week number when formatting date grouped by weeks (method read_group) (orm.py) 
bzr revid: ged@openerp.com-20140124100921-w5gq1fwidm01xx5l
 2014-01-24 11:09:21 +01:00
Thibault Delavallée ee692b43e2 [REF] account_product_template: reorganized the module, according to the 
new module guildelines :
- model files in model directory, with product and template addition
- view files in views directory, with product and template view addition
- demo file in data directory

bzr revid: tde@openerp.com-20140124095056-v18lfk9wex5y00d7
 2014-01-24 10:50:56 +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
Gery Debongnie 02f7760063 [IMP] adds an 'interval' attribute to 'field' in the rng file (view.rng) 
bzr revid: ged@openerp.com-20140124084319-g4al01wlwnxf8irh
 2014-01-24 09:43:19 +01:00
Turkesh Patel (Open ERP) 0ad36cf35f [IMP] improved code and send template only on cutomer invoice 
bzr revid: tpa@tinyerp.com-20140124060945-zn1bpzt41xwkh3p7
 2014-01-24 11:39:45 +05:30
Frédéric van der Essen c1ef35931a [MERGE] from trunk 
bzr revid: fva@openerp.com-20140123183154-5ju4r404kfcz5gp4
 2014-01-23 19:31:54 +01:00
Frédéric van der Essen fe5b70fa52 [FIX] hw_scanner: start scanner thread on first use to prevent start during unit tests 
bzr revid: fva@openerp.com-20140123180138-1g342p7y2aiakr76
 2014-01-23 19:01:38 +01:00
Frédéric van der Essen a656cc07ef [FIX] hw_scanner: prevent the keyboard capture thread from starting during unit testing 
bzr revid: fva@openerp.com-20140123171744-r36h0a2pkwp5kqlk
 2014-01-23 18:17:44 +01:00
Turkesh Patel (Open ERP) 43ba81ad1b [IMP] use product.template model for templates 
bzr revid: tpa@tinyerp.com-20140123134233-vp52fv0e047bbfgk
 2014-01-23 19:12:33 +05:30
Gery Debongnie a42900b8ea [FIX] fixes the read_group by dates tests (makes them use the field:interval syntax instead of using the context (test_orm.py) 
bzr revid: ged@openerp.com-20140123130603-5kdlb7as7fhmchd8
 2014-01-23 14:06:03 +01:00
Turkesh Patel (Open ERP) a8d65e4fa9 [IMP] improved certificates 
bzr revid: tpa@tinyerp.com-20140123123412-9y2hx0xqnc935zj8
 2014-01-23 18:04:12 +05:30
Turkesh Patel (Open ERP) e40c8d5502 [IMP] improved view 
bzr revid: tpa@tinyerp.com-20140123113921-v0ea72pdb8ansotu
 2014-01-23 17:09:21 +05:30
Turkesh Patel (Open ERP) 5c8a48a902 [IMP] add partner as a follower first. 
bzr revid: tpa@tinyerp.com-20140123112505-k21mvxf551xhtzad
 2014-01-23 16:55:05 +05:30
Gery Debongnie 99230cd3d1 [FIX] prints some value so i can understand how to debug the failing test in test_orm.py 
bzr revid: ged@openerp.com-20140123112347-0swvj6xrhp5r5mpq
 2014-01-23 12:23:47 +01:00
Turkesh Patel (Open ERP) 5d74ae6f3a [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20140123111345-h1z2mi0gko013whb
 2014-01-23 16:43:45 +05:30
Turkesh Patel (Open ERP) bfd0c1472b [MRG] add simplified form view of template for product 
bzr revid: tpa@tinyerp.com-20140123111229-8c1d7gf2osv6cql0
 2014-01-23 16:42:29 +05:30
Gery Debongnie 74fd48e608 [FIX] fixes the read_group by dates tests (makes them use the field:interval syntax instead of using the context (test_orm.py) 
bzr revid: ged@openerp.com-20140123105638-l4ej76ynf4avcjma
 2014-01-23 11:56:38 +01:00
Chirag Dodiya (OpenERP) afe9a79c28 [IMP]Improved template form view and set default value 
bzr revid: cod@tinyerp.com-20140123090713-v7rk0y9ot32nmmhs
 2014-01-23 14:37:13 +05:30
Antony Lesuisse 9248a2db18 [FIX] multiprocess mode, empty the cursor pool before forking 
bzr revid: al@openerp.com-20140122221525-hify023pk5i8d0jm
 2014-01-22 23:15:25 +01:00
Thibault Delavallée 7dd432cd5d [MERGE] [REF] [IMP] base_action_rule: allow using a resource.calendar to compute 
day-based timing conditions.

[REF] resource: cleaned, refactored and improved code for resource.calendar
module. Old API is kept for backward compatibility.
[TESTS] resource: added tests for the new implementation of the various
methods.

[IMP] base_action_rule: using the resource module, added the possibility
to specify a resource.calendar to compute day-based timing conditions.

[IMP] hr_contract: added an override of base action rule to add the possibility
of using an employees's resource.calendar to compute day-based timing
conditions.

bzr revid: tde@openerp.com-20140122150032-uu6mk8s0arachzy4
 2014-01-22 16:00:32 +01:00
Thibault Delavallée 339c2ecc54 [IMP] default_interval also in schedule_hours, allowing to 
schedule some work with a default calendar, like previous version
of resource module.

bzr revid: tde@openerp.com-20140122142805-8zyntmkx72l10fbq
 2014-01-22 15:28:05 +01:00
Thibault Delavallée 2f275894f3 [CLEAN] resource: removed some TDE NOTE 
bzr revid: tde@openerp.com-20140122134700-0iwb4uhg8jjdjzxn
 2014-01-22 14:47:00 +01:00
Thibault Delavallée 6df94832bd [CLEAN] resource: some cleaning in docstrings 
bzr revid: tde@openerp.com-20140122134609-7fvd1p49r8e40zoa
 2014-01-22 14:46:09 +01:00
Thibault Delavallée 9fbbba1ee0 [IMP] resource : some docstrings cleaning + void calendar 
taken into account in days scheduling + finished yesys

bzr revid: tde@openerp.com-20140122132918-4c1ag6y5gqasi32d
 2014-01-22 14:29:18 +01:00
Gery Debongnie 74386a5bb9 [IMP] changes the method read_group so that it now accepts groupbys of the form 'field:groupby_function', like 'create_date:week' for example. Also, removes the previous hack using the context (orm.py) 
bzr revid: ged@openerp.com-20140122124206-b5p06tpzw2i7tpo2
 2014-01-22 13:42:06 +01:00
Thibault Delavallée ec2c2d4e86 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
 2014-01-22 13:32:37 +01:00
Turkesh Patel (Open ERP) 5c97da019a [IMP] improved code to post send mail in chatter also 
bzr revid: tpa@tinyerp.com-20140122072603-wik5q5nw49mp562h
 2014-01-22 12:56:03 +05:30
Launchpad Translations on behalf of openerp 0f2d7e4820 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122054041-3ebv0zxz43meid0v
 2014-01-22 05:40:41 +00:00
Gery Debongnie 17e3c31992 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140113142459-pjoiau7pp4knvvda
bzr revid: ged@openerp.com-20140116144304-d00alltpt7j1gzvh
bzr revid: ged@openerp.com-20140121142924-641cu8trhm4pdf1m
 2014-01-21 15:29:24 +01:00
Turkesh Patel (Open ERP) 7ca3383659 [IMP] move demo data file in demo setion 
bzr revid: tpa@tinyerp.com-20140121124716-ipot2wp280ltloqa
 2014-01-21 18:17:16 +05:30
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
Turkesh Patel (Open ERP) c651b3554c [IMP] improved model given in template. 
bzr revid: tpa@tinyerp.com-20140121100835-k65dkw05dom4xlfs
 2014-01-21 15:38:35 +05:30
Turkesh Patel (Open ERP) 22a630fc57 [MRG] added new prodcut and templatre 
bzr revid: tpa@tinyerp.com-20140121095700-9j9qxx2bpgdluizg
 2014-01-21 15:27:00 +05:30