pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,232 Commits 1 Branch 0 Tags
c4cdceb0e0dff2c82cd80c0cdf92c1904a0aed8f
Commit Graph
83232 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ddm@openerp.com cc978e1490 [FIX] event tour edit 
bzr revid: ddm@openerp.com-20140124110552-ai7bfobl72n97bz1
 2014-01-24 12:05:52 +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
Josse Colpaert 6801d0c5af [MERGE] Merge from trunk-wms 
bzr revid: jco@openerp.com-20140124105943-hydqvz0klylm3ed5
 2014-01-24 11:59:43 +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
Josse Colpaert 47d04a43e1 [MERGE] Merge from trunk-wms 
bzr revid: jco@openerp.com-20140124105300-vaz4srntbhr9nyk4
 2014-01-24 11:53:00 +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
Fabien Meghazi 15c1d052e3 [IMP] Ensure slug validity otherwise redirect 
bzr revid: fme@openerp.com-20140124104610-lzsomdyl10ens0av
 2014-01-24 11:46:10 +01:00
Fabien Meghazi 2b6ac77f11 [IMP] move dispatch()'s post processing code into a method 
bzr revid: fme@openerp.com-20140124103546-h8an7dehqdc412cn
 2014-01-24 11:35:46 +01:00
Josse Colpaert 01679750c0 [IMP] Add product qty and UoM to repair order 
bzr revid: jco@openerp.com-20140124103501-jhz0v3l1pj68i8nb
 2014-01-24 11:35:01 +01:00
Quentin (OpenERP) 66fa4eaae4 [MERGE] stock: merged the branch that totally removed the automatic orderpoint feature (because it's a bit useless and will act like a slow MTO. Not needed) 
bzr revid: qdp-launchpad@openerp.com-20140124102838-j1it5wi8hkwfa83r
 2014-01-24 11:28:38 +01:00
ajay javiya (OpenERP) 898d888209 [REM]: unwanted code 
bzr revid: aja@tinyerp.com-20140124102500-vs4ix1vlcjgqlqj7
 2014-01-24 15:55:00 +05:30
Quentin (OpenERP) fbf6f7b654 [MERGE] stock: inventory button no the product form fixed 
bzr revid: qdp-launchpad@openerp.com-20140124102313-612a4sax44zkl74z
 2014-01-24 11:23:13 +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
Cedric Snauwaert 9c41b91632 [MERGE]merge with latest trunk-wms 
bzr revid: csn@openerp.com-20140124102008-13n2xg7w4tmyh7zk
 2014-01-24 11:20:08 +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
Quentin (OpenERP) 783a0d52ad [MERGE] purchase_requisition: fixed creation condition of purchase requisition from a procurement order 
lp bug: https://launchpad.net/bugs/1269504 fixed

bzr revid: qdp-launchpad@openerp.com-20140124095317-ac3jqqe4mautp26p
 2014-01-24 10:53:17 +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
Quentin (OpenERP) 1c90a06813 [MERGE] stock: fix of return picking wizard 
bzr revid: qdp-launchpad@openerp.com-20140124094734-am1el12zuhnoq714
 2014-01-24 10:47:34 +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
Cedric Snauwaert 70ec840eaf [MERGE]merge with latest wms-trunk 
bzr revid: csn@openerp.com-20140124094419-monnhyomr8721nbx
 2014-01-24 10:44:19 +01:00
Christophe Matthieu 8a5844d191 [IMP] website_sale: hide test tour from help menu 
bzr revid: chm@openerp.com-20140124094241-z1pf5895w2f2sfrh
 2014-01-24 10:42:41 +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
Christophe Matthieu 41210f45df [FIX] website snippet: When you click on the drag and drop arrow of a block without actually dragging, you shouldn't go to the top of the page. 
bzr revid: chm@openerp.com-20140124093421-o1rhe3p44ewwek9u
 2014-01-24 10:34:21 +01:00
Christophe Matthieu 8c5dda2480 [FIX] website css: rev/fix: Page under construction css; Add a choice 'non' for background snippet 
bzr revid: chm@openerp.com-20140124092853-taal585yz4v7fh20
 2014-01-24 10:28:53 +01:00
Quentin (OpenERP) fed73b3fed [MERGE] main trunk-wms branch 
bzr revid: qdp-launchpad@openerp.com-20140124092831-a365y0nmtkcel9wz
 2014-01-24 10:28:31 +01:00
Cedric Snauwaert 08cf92d5a8 [FIX]sale order workflow: fix problem when clicking on ignore delivery exception 
bzr revid: csn@openerp.com-20140124092758-tur7cs4d6br30x48
 2014-01-24 10:27:58 +01:00
ajay javiya (OpenERP) 9b43b4de76 [IMP]: send link with token to customer 
bzr revid: aja@tinyerp.com-20140124091930-16vwji8rgni1ad59
 2014-01-24 14:49:30 +05:30
Quentin (OpenERP) 2d27b4c824 [MERGE] stock: set order for inventory lines 
bzr revid: qdp-launchpad@openerp.com-20140124085501-omuyk0vgv3smrefl
 2014-01-24 09:55:01 +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
Gery Debongnie 29d08d9a6b [IMP] graph_view now properly honors the 'interval' attribute of field names in the xml description (addon web_graph) 
bzr revid: ged@openerp.com-20140124084222-dq1gpg1tg8rinozx
 2014-01-24 09:42:22 +01:00
Darshan Kalola (OpenERP) 40d0af06b2 [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140124064653-f92c75suuyzru0eq
 2014-01-24 12:16:53 +05:30
ajay javiya (OpenERP) 9fa6060a0a [IMP]: code 
bzr revid: aja@tinyerp.com-20140124063310-900f8l5dewjsizt1
 2014-01-24 12:03:10 +05:30
Launchpad Translations on behalf of openerp c5dd038011 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
 2014-01-24 06:25:06 +00: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
Christophe Matthieu f45e0198a5 [FIX] website: tour 
bzr revid: chm@openerp.com-20140123183548-3s842ye1whbvmrq0
 2014-01-23 19:35:48 +01:00
Christophe Simonis 2cf97c76d3 [IMP] product: correct copy() of products variants 
bzr revid: chs@openerp.com-20140123183208-jg76zjt7tzd1fl75
 2014-01-23 19:32:08 +01:00
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
Denis Ledoux c76e580da5 [ADD] crm: mass assign apply deduplication 
bzr revid: dle@openerp.com-20140123180211-o1ebik36wegmi8mc
 2014-01-23 19:02:11 +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
Christophe Simonis a7e920aee2 [FIX] edi: only catch ValueError when getting record from xmlid 
bzr revid: chs@openerp.com-20140123175054-r2zq9elx23t6p0cv
 2014-01-23 18:50:54 +01:00
Christophe Simonis 2090330b67 [FIX] move function field amount_delivery from delivery module to website_sale_delivery module 
bzr revid: chs@openerp.com-20140123174208-yzlod98ez4xn72lv
 2014-01-23 18:42:08 +01:00
Josse Colpaert 386f7c1212 [WIP] Change repair orders not to use quants, but always to create move that splits quant from a certain location and lot 
bzr revid: jco@openerp.com-20140123172741-cjgzps1twsvv0n76
 2014-01-23 18:27:41 +01:00
ddm@openerp.com e42d639c87 [FIX] indentation 
bzr revid: ddm@openerp.com-20140123172714-0fumk1t7hjoz1506
 2014-01-23 18:27:14 +01:00
ddm@openerp.com 0aba10073e [IMP] add 'Website Settings' to customize menu 
bzr revid: ddm@openerp.com-20140123172543-3k7w0221ssjsserr
 2014-01-23 18:25:43 +01:00
ddm@openerp.com 8c8b20bc66 [IMP] add link to payment acquirers in website settings 
bzr revid: ddm@openerp.com-20140123172455-7prrhpxfakgg0zv4
 2014-01-23 18:24:55 +01:00