diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index effeea60585..47838897164 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -44,11 +44,9 @@ technical OpenERP documentation at http://doc.openerp.com
'test/edi_partner_test.yml',
],
'js': [
- 'static/src/js/sessionless.js',
- 'static/src/js/edi_import.js',
- 'static/src/js/edi_view.js',
- 'static/src/js/edi_invoice.js',
- 'static/src/js/edi_sale_purchase_order.js',
+ 'static/src/js/edi.js',
+ #'static/src/js/edi_invoice.js',
+ #'static/src/js/edi_sale_purchase_order.js',
],
"css": [
"static/src/css/edi.css"
@@ -58,4 +56,4 @@ technical OpenERP documentation at http://doc.openerp.com
'certificate': '002046536359186',
}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/controllers/__init__.py b/addons/edi/controllers/__init__.py
index 45a091bdacc..8ee9bae18d9 100644
--- a/addons/edi/controllers/__init__.py
+++ b/addons/edi/controllers/__init__.py
@@ -1,3 +1 @@
-import edi_get
-import edi_view
-import edi_import
+import main
diff --git a/addons/edi/controllers/edi_get.py b/addons/edi/controllers/edi_get.py
deleted file mode 100644
index 8d78a4d69b1..00000000000
--- a/addons/edi/controllers/edi_get.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import werkzeug.wrappers
-import web.common.http as openerpweb
-import json
-
-class EDIGet(openerpweb.Controller):
- # http://path.to.web.client:8080/web/get_edi?db=XXXX&token=XXXXXXXXXXX
- _cp_path = "/web/get_edi"
-
- @openerpweb.httprequest
- def index(self, req, db, token):
- result = req.session.proxy('edi').get_edi_document(db, token)
- response = werkzeug.wrappers.Response(
- result, headers=[('Content-Type', 'text/html; charset=utf-8'),
- ('Content-Length', len(result))])
-
- return response
-
- @openerpweb.jsonrequest
- def get_edi_document(self, req, db, token):
- result = req.session.proxy('edi').get_edi_document(db, token)
- document = json.loads(result)
- model = document and document[0].get('__model')
- return {'token': token, 'db': db, 'model':model.replace('.','_'), 'document':document}
-
-
diff --git a/addons/edi/controllers/edi_import.py b/addons/edi/controllers/edi_import.py
deleted file mode 100644
index 462c9af94dc..00000000000
--- a/addons/edi/controllers/edi_import.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import werkzeug.wrappers
-import web.common.http as openerpweb
-import web.controllers.main as web
-import json
-import textwrap
-
-edi_import_template = textwrap.dedent("""
-
-
- ')
+ .appendTo(document.body)
+ .delegate('#oe_edi_invoice_button_pay', 'click', {'edi': edi} , this.do_pay)
+ },
+ start: function() {
+ },
+ render: function(){
+ template = "InvoiceEdiView";
+ if (this.$current) {
+ this.$current.remove();
+ }
+ this.$current = this.$_element.clone(true);
+ this.$current.empty().append($(QWeb.render(template, {'invoices': this.edi_document})));
+ this.$element.append(this.$current);
+ },
+ do_pay: function(e){
+ $element = $(e.view.document.body)
+ token = e.data.edi.token
+ db = e.data.edi.db
+ var current_url = $(location).attr('href')
+ var pathName = current_url.substring(0, current_url.lastIndexOf('/') +1);
+
+ if ($element.find('#oe_edi_invoice_rd_pay_paypal').attr('checked') == 'checked') {
+ alert('Pay Invoice using Paypal service');
+ }
+ if ($element.find('#oe_edi_invoice_rd_pay_google_checkout').attr('checked') == 'checked') {
+ alert('Pay Invoice using Google Checkout');
+ }
+ if ($element.find('#oe_edi_invoice_rd_pay_bank').attr('checked') == 'checked') {
+ alert('Pay Invoice using Bankwire Trasnfer')
+ }
+ }
+});
+
+}
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/edi/static/src/js/edi_import.js b/addons/edi/static/src/js/edi_import.js
deleted file mode 100644
index 5219676405f..00000000000
--- a/addons/edi/static/src/js/edi_import.js
+++ /dev/null
@@ -1,75 +0,0 @@
-
-openerp.web.edi_import = function(openerp) {
-var QWeb = new QWeb2.Engine();
-openerp.web.EdiImport = openerp.web.WebClient.extend({
-
- init: function(element_id) {
- this._super(element_id);
- },
- start: function() {
- this._super();
- },
- do_import: function(){
- var self = this;
- self.rpc('/web/import_edi/import_edi_url', self.params, function(response){
- if (response.length) {
- $('
Import successful, click Ok to see the new document
').dialog({
- modal: true,
- title: 'Successful',
- buttons: {
- Ok: function() {
- $(this).dialog("close");
- var action = {
- "res_model": response[0][0],
- "res_id": parseInt(response[0][1], 10),
- "views":[[false,"form"]],
- "type":"ir.actions.act_window",
- "view_type":"form",
- "view_mode":"form"
- }
- action.flags = {
- search_view: false,
- sidebar : false,
- views_switcher : false,
- action_buttons : false,
- pager: false
- }
- var action_manager = new openerp.web.ActionManager(self);
- action_manager.appendTo($("#oe_app"));
- action_manager.start();
- action_manager.do_action(action);
- }
- }
-
- });
- }
- else{
- $(QWeb.render("DialogWarning", "Sorry, Import is not successful.")).dialog({
- modal: true,
- buttons: {
- Ok: function() {
- $(this).dialog("close");
- }
- }
- });
- }
- });
- },
- import_edi: function(edi_url) {
- var self = this;
- this.params = {};
-
- if(edi_url) this.params['edi_url'] = decodeURIComponent(edi_url);
-
- if (!this.session.db){
- this.start();
- this.session.on_session_valid.add_last(self.do_import);
-
- }
- else{
- self.do_import();
- }
- }
-});
-}
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/edi/static/src/js/edi_invoice.js b/addons/edi/static/src/js/edi_invoice.js
index 9c1748d5bf9..c68d27ec718 100644
--- a/addons/edi/static/src/js/edi_invoice.js
+++ b/addons/edi/static/src/js/edi_invoice.js
@@ -1,9 +1,8 @@
/*---------------------------------------------------------
* EDI Web Interface for Invoice
*---------------------------------------------------------*/
-//
-openerp.web.edi_invoice = function(openerp) {
+openerp.edi.edi_invoice = function(openerp) {
var QWeb = new QWeb2.Engine();
openerp.web.edi_views.add('view_center_account_invoice' , 'openerp.web.EdiViewCenterInvoice');
@@ -35,17 +34,13 @@ openerp.web.EdiViewCenterInvoice = openerp.web.Class.extend({
var current_url = $(location).attr('href')
var pathName = current_url.substring(0, current_url.lastIndexOf('/') +1);
- if ($element.find('#oe_edi_invoice_rd_pay_paypal').attr('checked') == 'checked')
- {
+ if ($element.find('#oe_edi_invoice_rd_pay_paypal').attr('checked') == 'checked') {
alert('Pay Invoice using Paypal service');
-
}
- if ($element.find('#oe_edi_invoice_rd_pay_google_checkout').attr('checked') == 'checked')
- {
+ if ($element.find('#oe_edi_invoice_rd_pay_google_checkout').attr('checked') == 'checked') {
alert('Pay Invoice using Google Checkout');
}
- if ($element.find('#oe_edi_invoice_rd_pay_bank').attr('checked') == 'checked')
- {
+ if ($element.find('#oe_edi_invoice_rd_pay_bank').attr('checked') == 'checked') {
alert('Pay Invoice using Bankwire Trasnfer')
}
}
diff --git a/addons/edi/static/src/js/edi_sale_purchase_order.js b/addons/edi/static/src/js/edi_sale_purchase_order.js
deleted file mode 100644
index 1216957bf72..00000000000
--- a/addons/edi/static/src/js/edi_sale_purchase_order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-openerp.web.edi_sale_purchase_order = function(openerp) {
-var QWeb = new QWeb2.Engine();
-
-openerp.web.edi_views.add('view_center_sale_order' , 'openerp.web.EdiViewCenterSalePurchase');
-openerp.web.edi_views.add('view_center_purchase_order' , 'openerp.web.EdiViewCenterSalePurchase');
-openerp.web.EdiViewCenterSalePurchase = openerp.web.Class.extend({
- init: function(element, edi){
- var self = this;
- this.edi_document = eval(edi.document)
- this.$element = element;
- QWeb.add_template("/edi/static/src/xml/edi_sale_purchase_order.xml");
-
- },
- start: function() {
- },
- render: function(){
- template = "OrderEdiView";
- this.$element.append($(QWeb.render(template, {'orders': this.edi_document})));
- },
-
-});
-}
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/edi/static/src/js/edi_view.js b/addons/edi/static/src/js/edi_view.js
deleted file mode 100644
index 97642609f57..00000000000
--- a/addons/edi/static/src/js/edi_view.js
+++ /dev/null
@@ -1,148 +0,0 @@
-
-openerp.web.edi_view = function(openerp) {
- openerp.web.edi_views = new openerp.web.Registry();
- var QWeb = new QWeb2.Engine();
- // EDI View Engine
- openerp.web.EdiView = openerp.web.Sessionless.extend({
- init: function(element_id){
- var self = this;
- this.template = "EdiView";
- this.element_id = element_id;
- this.$element = $('#' + element_id);
- QWeb.add_template("/edi/static/src/xml/edi.xml");
-
- },
- start: function() {
- },
- view_edi: function(token, db) {
- var params = {};
- if(token) params['token'] = token;
- if(db) params['db'] = db;
- this.rpc('/web/get_edi/get_edi_document', params, this.on_response);
- },
-
- on_response: function(value){
- var self = this;
- this.template = "EdiView";
- this.element_id = "oe";
- self.$element = $('#' + this.element_id);
- self.$element.html(QWeb.render(self.template, this));
-
- var edi_document = value.document;
-
- var render = function(key, element_id, response){
- var registry = openerp.web.edi_views;
- model = response.model
- // get namespace of view of particular model from registry
- try {
- edi_view = registry.get_object(key + '_' + model);
- }catch (e) {
- edi_view = undefined;
- }
- // if not found, take default namespace of view
- if (edi_view == undefined){
- edi_view = registry.get_object(key)
- }
- $edi_frame = self.$element.find(element_id);
-
- // create instance of QWeb of view namespace
- edi_qweb = new (edi_view)($edi_frame, response)
- edi_qweb.render();
- };
-
- // EDI Center Frame
- render('view_center', 'div.oe_edi_center', value)
-
- // EDI Right TOP Frame
- render('view_right_top', 'div.oe_edi_right_top', value)
-
- //EDI Right Bottom Frame
- render('view_right_bottom', 'div.oe_edi_right_bottom', value)
-
- },
-
- });
-
-openerp.web.edi_views.add('view_center' , 'openerp.web.EdiViewCenter');
-openerp.web.EdiViewCenter = openerp.web.Class.extend({
- init: function(element, edi){
- var self = this;
- this.edi_document = edi.document;
- this.$element = element;
- QWeb.add_template("/edi/static/src/xml/edi.xml");
- },
- start: function() {
- },
- render: function(){
- template = "EdiViewCenter";
- this.$element.append($(QWeb.render(template, {'view': this})))
- }
-});
-
-openerp.web.edi_views.add('view_right_top' , 'openerp.web.EdiViewRightTop');
-openerp.web.EdiViewRightTop = openerp.web.Class.extend({
- init: function(element, edi){
- var self = this;
- this.edi_document = edi.document;
- this.$element = element;
- QWeb.add_template("/edi/static/src/xml/edi.xml");
- this.$_element = $('
')
- .appendTo(document.body)
- .delegate('button.oe_edi_button_import', 'click', {'edi': edi} , this.do_import)
- },
- start: function() {
- },
- render: function(){
- template = "EdiViewRightTop";
- if (this.$current) {
- this.$current.remove();
- }
- this.$current = this.$_element.clone(true);
- this.$current.empty().append(QWeb.render(template, this));
- this.$element.append(this.$current);
- },
- do_import: function(e){
- $element = $(e.view.document.body)
- token = e.data.edi.token
- db = e.data.edi.db
- var current_url = $(location).attr('href')
- var pathName = current_url.substring(0, current_url.lastIndexOf('/') +1);
-
- if ($element.find('#oe_edi_rd_import_openerp').attr('checked') == 'checked')
- {
- // import EDI
- server_url = $element.find('#oe_edi_txt_server_url').val()
- edi_url = pathName + 'get_edi?db=' + db + '&token=' + token
- edi_url = encodeURIComponent(edi_url)
- window.location = 'http://' + server_url + '/web/import_edi?edi_url=' + edi_url
- }
- if ($element.find('#oe_edi_rd_import_saas_account').attr('checked') == 'checked')
- {
- // create SAAS Account
- }
- if ($element.find('#oe_edi_rd_import_other').attr('checked') == 'checked')
- {
- // GET EDI document
- edi_url = pathName + 'get_edi?db=' + db + '&token=' + token
- window.location = edi_url
- }
- }
-});
-
-openerp.web.edi_views.add('view_right_bottom' , 'openerp.web.EdiViewRightBottom');
-openerp.web.EdiViewRightBottom = openerp.web.Class.extend({
- init: function(element, edi){
- var self = this;
- this.edi_document = edi.document;
- this.$element = element;
- QWeb.add_template("/edi/static/src/xml/edi.xml");
- },
- start: function() {
- },
- render: function(){
- template = "EdiViewRightBottom";
- this.$element.append($(QWeb.render(template, this)))
- }
-});
-}
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/edi/static/src/js/sessionless.js b/addons/edi/static/src/js/sessionless.js
deleted file mode 100644
index 8890ab938cd..00000000000
--- a/addons/edi/static/src/js/sessionless.js
+++ /dev/null
@@ -1,75 +0,0 @@
-openerp.web.sessionless = function(openerp) {
- var QWeb = new QWeb2.Engine();
- openerp.web.Sessionless = openerp.web.SessionAware.extend({
- rpc: function(url, params, success_callback, error_callback) {
- var self = this;
- // Call using the rpc_mode
- var deferred = $.Deferred();
- this.rpc_ajax(url, {
- jsonrpc: "2.0",
- method: "call",
- params: params,
- id:null
- }).then(function () {deferred.resolve.apply(deferred, arguments);},
- function(error) {deferred.reject(error, $.Event());});
- return deferred.fail(function() {
- deferred.fail(function(error, event) {
- if (!event.isDefaultPrevented()) {
- self.on_rpc_error(error, event);
- }
- });
- }).then(success_callback, error_callback).promise();
- },
- /**
- * Raw JSON-RPC call
- *
- * @returns {jQuery.Deferred} ajax-webd deferred object
- */
- rpc_ajax: function(url, payload) {
- var self = this;
- this.on_rpc_request();
- // url can be an $.ajax option object
- if (_.isString(url)) {
- url = {
- url: url
- }
- }
- var ajax = _.extend({
- type: "POST",
- url: url,
- dataType: 'json',
- contentType: 'application/json',
- data: JSON.stringify(payload),
- processData: false
- }, url);
- var deferred = $.Deferred();
- $.ajax(ajax).done(function(response, textStatus, jqXHR) {
- self.on_rpc_response();
- if (!response.error) {
- deferred.resolve(response["result"], textStatus, jqXHR);
- return;
- }
- if (response.error.data.type !== "session_invalid") {
- deferred.reject(response.error);
- return;
- }
-
- }).fail(function(jqXHR, textStatus, errorThrown) {
- self.on_rpc_response();
- var error = {
- code: -32098,
- message: "XmlHttpRequestError " + errorThrown,
- data: {type: "xhr"+textStatus, debug: jqXHR.responseText, objects: [jqXHR, errorThrown] }
- };
- deferred.reject(error);
- });
- return deferred.promise();
- },
- on_rpc_request: function() {
- },
- on_rpc_response: function() {
- },
- on_rpc_error: function(error) {
- },
- });
-}
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 6419ab4ebd0..5b50a018181 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -1,100 +1,57 @@
+
+
+
-
-
-
-
-
-
diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
new file mode 100644
index 00000000000..64ef22caefb
--- /dev/null
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+ Invoice :
+
+
+
+
+
+
+ Phone:
+
+
+
+
+
+
+
+
+ Description |
+ Date |
+ Origin |
+ Your Reference |
+
+
+ |
+ |
+ |
+ |
+
+
+
+
+ Product Description |
+ Quantity |
+ Unit Price |
+ Discount |
+ Price |
+
+
+
+
|
+ |
+ |
+ |
+ |
+
+
+
+ |
+
|
+
+
+ |
+ Net Total: |
+ |
+
+
+ |
+ Taxes: |
+ |
+
+
+ |
+
|
+
+
+ |
+ Total: |
+ |
+
+
+
+
+
+ Tax |
+ Base Amount |
+ Amount |
+
+
+
+ |
+ |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
diff --git a/addons/edi/static/src/xml/edi_invoice.xml b/addons/edi/static/src/xml/edi_invoice.xml
deleted file mode 100644
index 2da11bf6475..00000000000
--- a/addons/edi/static/src/xml/edi_invoice.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
- Invoice :
-
-
-
-
-
-
- Phone:
-
-
-
-
-
-
-
-
- Description |
- Date |
- Origin |
- Your Reference |
-
-
- |
- |
- |
- |
-
-
-
-
- Product Description |
- Quantity |
- Unit Price |
- Discount |
- Price |
-
-
-
-
-
|
- |
- |
- |
- |
-
-
-
-
-
- |
-
|
-
-
- |
- Net Total: |
- |
-
-
- |
- Taxes: |
- |
-
-
- |
-
|
-
-
- |
- Total: |
- |
-
-
-
-
-
- Tax |
- Base Amount |
- Amount |
-
-
-
-
-
- |
- |
- |
-
-
-
-
-
- | |
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
new file mode 100644
index 00000000000..2f7cdc3d664
--- /dev/null
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -0,0 +1,80 @@
+
+
+ Order :
+
+
+
+
+
+
+ Phone:
+
+
+
+
+
+
+
+
+
+ Description |
+ Date |
+ Origin |
+ Your Reference |
+
+
+ |
+ |
+ |
+
+
+
+ |
+
+
+
+
+ Product Description |
+ Unit Price |
+ Quantity |
+ UOM |
+ Price |
+
+
+
+ |
+ |
+
+
+
+ |
+ |
+ |
+
+
+
+ |
+
|
+
+
+ |
+ Net Total: |
+ |
+
+
+ |
+ Taxes: |
+ |
+
+
+ |
+
|
+
+
+ |
+ Total: |
+ |
+
+
+
+
diff --git a/addons/edi/static/src/xml/edi_sale_purchase_order.xml b/addons/edi/static/src/xml/edi_sale_purchase_order.xml
deleted file mode 100644
index 71d15ec3ed4..00000000000
--- a/addons/edi/static/src/xml/edi_sale_purchase_order.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
- Order :
-
-
-
-
-
-
- Phone:
-
-
-
-
-
-
-
-
-
- Description |
- Date |
- Origin |
- Your Reference |
-
-
-
- |
- |
- |
-
-
-
- |
-
-
-
-
-
- Product Description |
- Unit Price |
- Quantity |
- UOM |
- Price |
-
-
-
-
- |
- |
-
-
-
- |
- |
- |
-
-
-
-
- |
-
|
-
-
- |
- Net Total: |
- |
-
-
- |
- Taxes: |
- |
-
-
- |
-
|
-
-
- |
- Total: |
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 691665f4919..49fbf42b584 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -12,7 +12,7 @@ try:
tmpl = self.pool.get('ir.model.data').get_object(cr, uid, 'sale', 'email_template_edi_sale')
edi_token = self.pool.get('edi.document').export_edi(cr, uid, [object], context = context)[0]
- context.update(edi_web_url_view='%s/web/view_edi?db=%s&token=%s' %(web_root_url, cr.dbname, edi_token))
+ context.update(edi_web_url_view='%s/edi/view?idebug=1&db=%s&token=%s' %(web_root_url, cr.dbname, edi_token))
self.pool.get('email.template').send_mail(cr, uid,tmpl.id,object.id,context=context)
except:
pass