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
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Trigaux 1fe9b19c83 [FIX] sale_stock: take into account the value of the customer reference on grouped invoice (opw #599716) 
bzr revid: mat@openerp.com-20131115134335-qsu8ceyx86zyfj8j
 2013-11-15 14:43:35 +01:00
Thibault Delavallée 9f38df4d57 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
 2013-11-15 14:36:35 +01:00
Thibault Delavallée 28c864b00f [IMP] website_sale: added basic management of acquirer button in sale. 
The action of the rendered button is catched, re-routed to a custom controller in sale that
creates the payment.transaction, or fetch an already-existing one.

Once the transaction is found or created, the user is redirected to the acquirer
transaction url.

Next step: display the transaction status in the payment page.

bzr revid: tde@openerp.com-20131115133414-jiob0gkpv106db27
 2013-11-15 14:34:14 +01:00
Thibault Delavallée d55b40d3a1 [CLEAN] website_payment: removed dead code in html view 
bzr revid: tde@openerp.com-20131115133209-u1z48pmw991zwdc4
 2013-11-15 14:32:09 +01:00
Thibault Delavallée f5a6f12ead [IMP] payment_acquirer_paypal: improved urls in rendered button, now using urljoin; improve dbutton; removed dead method; slightly improved controllers 
bzr revid: tde@openerp.com-20131115133133-qhij4k0c48k96mfq
 2013-11-15 14:31:33 +01:00
Thibault Delavallée 9e1753e98b [IMP] payment_acquirer_ogone: improved urls in rendered button, now using urljoin; added support of PARAMPLUS in button; various fixes due to method renaming; improved controllers; updated tests 
bzr revid: tde@openerp.com-20131115133047-eggqo2a3sapzri2j
 2013-11-15 14:30:47 +01:00
Thibault Delavallée c1257b5483 [MERGE] Coming from failed merge 
bzr revid: tde@openerp.com-20131115132923-3nqsfqah4dfc3lyx
 2013-11-15 14:29:23 +01:00
Xavier Morel 780c35598d [MERGE] from trunk 
bzr revid: xmo@openerp.com-20131115132903-epi3321e4uxjqtn2
 2013-11-15 14:29:03 +01:00
Thibault Delavallée 6e3dd819ea [IMP] payment_acquirer: various improvements 
- added a constraint on reference that should be unique
- remove dead method validate
- added some comments
- improved payment.transaction views

bzr revid: tde@openerp.com-20131115132838-8nta3pq1ftj8t2q5
 2013-11-15 14:28:38 +01:00
Thibault Delavallée 029993ea1d [MERGE] Sync with website-al (strange merge) 
bzr revid: tde@openerp.com-20131115132821-js9kkwuh25e9qt74
 2013-11-15 14:28:21 +01:00
Xavier Morel e7117a5799 [FIX] altered trunk routing stuff, bring website converters back in website 
bzr revid: xmo@openerp.com-20131115132626-60p0yk3jv1pk6mhb
 2013-11-15 14:26:26 +01:00
Xavier Morel 8e78b40e6a [MERGE] from trunk 
bzr revid: xmo@openerp.com-20131115132553-9eqxggih8be63i36
 2013-11-15 14:25:53 +01:00
Amit Bhavsar (Open ERP) 9cc4983fb7 Override demo data for prouct_visible_discount and remove unused code from dka merge. 
bzr revid: amb@tinyerp.com-20131115124902-om1kduj623f9cub8
 2013-11-15 18:19:02 +05:30
Xavier Morel 0ece469392 [FIX] bunch of broken stuff over http requests in new routing thing 
* make ModelConverter use its regex for data extraction so
  replacements can just fixup the request and don't have to mess with
  _uid

* replace routing_map property by method, for unknown reasons the
  property does not work at least overridden (it's not found) and I
  don't care enough to wonder why

* arguments result from MapAdapter.match() is a mapping, not a
  sequence. Iterate through values()/itervalues() otherwise we'll
  never get a browse_record to do the uid substitution on, only
  strings (params names)

* inject arguments from URL map/match into the function before
  executing it, this was apparently lost during the transition

* reintroduce get_db_router for third-party code needing to generate
  URLs

bzr revid: xmo@openerp.com-20131115124819-bp4gjpfdlda2qyf5
 2013-11-15 13:48:19 +01:00
Gery Debongnie ab1411aa9e [IMP] makes the text clickable in clickable cells in pivottable (addon web_graph) 
bzr revid: ged@openerp.com-20131115121315-2lb0mptvv44g8xjk
 2013-11-15 13:13:15 +01:00
Xavier Morel 60863b5ab0 [MERGE] from trunk 
bzr revid: xmo@openerp.com-20131115121027-nwm6t768w6fjkqhi
 2013-11-15 13:10:27 +01:00
Christophe Matthieu 162754294c [FIX] no superuser in view, todo: use frontend widget contact 
bzr revid: chm@openerp.com-20131115115513-jbvmt9wb7orndc8t
 2013-11-15 12:55:13 +01:00
Fabien Pinckaers 14edb56bb3 [IMP] CSS cleaning: edit menu 
bzr revid: fp@tinyerp.com-20131115115122-zzg6xeisa85n45e1
 2013-11-15 12:51:22 +01:00
Gery Debongnie 776a57ef0c [FIX] fixes a bug where the view build a table without clearing the existing rows (addon web_graph) 
bzr revid: ged@openerp.com-20131115112659-mzb4smcr85dq60ww
 2013-11-15 12:26:59 +01:00
Christophe Simonis 36b3ea41d8 [MERGE] forward port of branch saas-1 up to revid 3751 chs@openerp.com-20131115104909-3u3mu40g9xnler88 
bzr revid: chs@openerp.com-20131115112311-mq197ugcdc38gjnw
 2013-11-15 12:23:11 +01:00
Gery Debongnie 75caaeb1a3 [IMP] smarter behavior when unfolding/refolding: check 'unfolding' level and do not ask what field to expand if it already knows (addon web_graph) 
bzr revid: ged@openerp.com-20131115111932-rdphi3w01nmein7t
 2013-11-15 12:19:32 +01:00
Paramjit Singh Sahota e8beafdce3 [IMP] Improved code for the condition when the Opening With Last closing Balance is marked true. 
bzr revid: psa@tinyerp.com-20131115110746-omzn51lsqhnctsqn
 2013-11-15 16:37:46 +05:30
Turkesh Patel (Open ERP) a254e5fca9 [ADD] added record rules for analysis report objects. 
bzr revid: tpa@tinyerp.com-20131115104909-izjhuoy3eyy1vfjk
 2013-11-15 16:19:09 +05:30
Christophe Simonis 993bff902e [MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv 
bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88
 2013-11-15 11:49:09 +01:00
Fabien Pinckaers 963c994be8 [IMP] layout issue minor 
bzr revid: fp@tinyerp.com-20131115102901-9vm2whxw0t9ahfvs
 2013-11-15 11:29:01 +01:00
ddm d8f8974f51 [FIX] Banner tour redirects to homepage 
bzr revid: ddm@openerp.com-20131115102434-i8vq7xgn6lbpz34f
 2013-11-15 11:24:34 +01:00
bth-openerp 8ed6aa96d7 [IMP]Improved code to company true. 
bzr revid: bth@tinyerp.com-20131115101647-g5h3n545730qorbz
 2013-11-15 15:46:47 +05:30
ima-openerp 88a79fdaf3 [IMP]improved css for survey kanban, file attach button and my current timesheet in hr. 
bzr revid: ima@tinyerp.com-20131115101317-3jb422klc3jgdwps
 2013-11-15 15:43:17 +05:30
Xavier Morel 321d4681e1 [IMP] new routing thing 
* fix nameerror on SessionExpired exception not being imported
* remove pointless RequestUID instantiation by single placeholder object
  - may be replaceable with a LocalProxy or something along those lines?
* rename default/nodb routing map
* make better use of werkzeug API
* move lazy routing_map instantiation to property in ir_http.find_handler
  - do we have some sort of lazy_property?

bzr revid: xmo@openerp.com-20131115100901-s3skmwv9d1jgk9y0
 2013-11-15 11:09:01 +01:00
ddm f449371223 [IMP] Better tour naming 
bzr revid: ddm@openerp.com-20131115100651-jifmv37b36v0dyya
 2013-11-15 11:06:51 +01:00
Xavier Morel 34c3beda2b [REM] undead web_shortcuts 
bzr revid: xmo@openerp.com-20131115095255-25583k4pie9avplf
 2013-11-15 10:52:55 +01:00
Olivier Dony 7935caad7d [REM] base_crypt translation deactivated - module renamed to auth_crypt 
bzr revid: odo@openerp.com-20131115094146-56bv3ewes59jnf7e
 2013-11-15 10:41:46 +01:00
Fabien Pinckaers bc5400c679 [FIX] small fix, better style 
bzr revid: fp@tinyerp.com-20131115094121-m1ojraypbxfg0i5r
 2013-11-15 10:41:21 +01:00
Fabien Pinckaers 0ffbbe6d95 [FIX] small fix, better style 
bzr revid: fp@tinyerp.com-20131115094054-rqe9ry33x5iyipl4
 2013-11-15 10:40:54 +01:00
Fabien Pinckaers d660e00a38 [IMP] wording for customize 
bzr revid: fp@tinyerp.com-20131115093015-ijrdosfplxg322l1
 2013-11-15 10:30:15 +01:00
Fabien Pinckaers 6f9a8b5067 [IMP] wording 
bzr revid: fp@tinyerp.com-20131115092825-b0zar6drl3kjza1t
 2013-11-15 10:28:25 +01:00
Fabien Pinckaers 75a94c9642 [IMP] URL of blogs 
bzr revid: fp@tinyerp.com-20131115092610-6xchn39sg3phftax
 2013-11-15 10:26:10 +01:00
Gery Debongnie fecfa8e52c [IMP] makes display smarter list of options in dropdown menu on pivottable widget (addon web_graph) 
bzr revid: ged@openerp.com-20131115092411-abnckphk4mn9ji3z
 2013-11-15 10:24:11 +01:00
Fabien Pinckaers d13bae79ec [IMP] Small improvements blog post 
bzr revid: fp@tinyerp.com-20131115091507-rz0d7d0xxfeygfix
 2013-11-15 10:15:07 +01:00
Fabien Pinckaers 266a57fcaa [FIX] blog categories, right URL 
bzr revid: fp@tinyerp.com-20131115090106-y8is2u9mrszaqfl2
 2013-11-15 10:01:06 +01:00
Fabien Pinckaers 3e74c0f7b6 [IMP] Blogs better views hierarchies 
bzr revid: fp@tinyerp.com-20131115085632-aj2cqpwp712599jx
 2013-11-15 09:56:32 +01:00
Gery Debongnie 2609105d41 [IMP] allow pivottable to fold rows (addon web_graph) 
bzr revid: ged@openerp.com-20131115085037-nhbi5x9ooa75drnk
 2013-11-15 09:50:37 +01:00
Turkesh Patel (Open ERP) 559d534631 [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20131115072236-oqmd6bpe2oetvldy
 2013-11-15 12:52:36 +05:30
Launchpad Translations on behalf of openerp 1d354694cf Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131115063223-eu9nf550yqn4iu0g
 2013-11-15 06:32:23 +00:00
Launchpad Translations on behalf of openerp 3aeed93fc1 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131115054705-wvkm0ko44q3r6g4f
 2013-11-15 05:47:05 +00:00
Olivier Dony 362c25c957 [FIX] base: invalid ISO code for former Venezuela bolivar - ISO 4217 says VEB 
XML ID is preserved for compatibility, will be updated in trunk.

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

bzr revid: odo@openerp.com-20131114230508-g1q02h823xg8pj1n
 2013-11-15 00:05:08 +01:00
Olivier Dony 7dd7fcf0d5 [MERGE] base: invalid currency for Venezuela, courtesy of Nhomar (Vauxoo) 
Country data is incorrect for Venezuela, the country currency is VEF not VUB (the old ones) wich technically is incorrect too because it was VEB.

bzr revid: odo@openerp.com-20131114230223-6cvybpthj70hr81m
 2013-11-15 00:02:23 +01:00
Fabien Pinckaers 9570a51bcd [IMP] style menu editor 
bzr revid: fp@openerp.com-20131114214554-lak8rntdpq6clcpm
 2013-11-14 22:45:54 +01:00
Fabien Pinckaers 85265aefb9 [IMP] layout of website.prompt 
bzr revid: fp@openerp.com-20131114212856-ff42xtka5dlv8c8c
 2013-11-14 22:28:56 +01:00
Fabien Meghazi cf5dfe897e [IMP] Menu editor: home icon on right 
bzr revid: fme@openerp.com-20131114211132-bjrkreuy9b0fhqey
 2013-11-14 22:11:32 +01:00