Attached Files | Screenshot from 2014-12-22 09:19:14.png [^] (157,993 bytes) 2014-12-22 09:21

Screenshot from 2014-12-22 09:19:04.png [^] (147,921 bytes) 2014-12-22 09:21

Screenshot from 2014-12-22 09:18:51.png [^] (150,792 bytes) 2014-12-22 09:21

bPartnerOnHold.diff [^] (8,464 bytes) 2014-12-22 09:30 [Show Content] [Hide Content]diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -4383,6 +4383,18 @@
<!--CC01253339C64103954A359CD6C68422--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--CC01253339C64103954A359CD6C68422--></AD_MESSAGE>
+<!--CC338C33EFF145DABB87AE12ED46CE88--><AD_MESSAGE>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <AD_MESSAGE_ID><![CDATA[CC338C33EFF145DABB87AE12ED46CE88]]></AD_MESSAGE_ID>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <VALUE><![CDATA[OBPOS_OnHold]]></VALUE>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <MSGTEXT><![CDATA[On Hold]]></MSGTEXT>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--CC338C33EFF145DABB87AE12ED46CE88--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--CC338C33EFF145DABB87AE12ED46CE88--></AD_MESSAGE>
+
<!--CCED3399AA7A40CEBB2A00088AD39BCF--><AD_MESSAGE>
<!--CCED3399AA7A40CEBB2A00088AD39BCF--> <AD_MESSAGE_ID><![CDATA[CCED3399AA7A40CEBB2A00088AD39BCF]]></AD_MESSAGE_ID>
<!--CCED3399AA7A40CEBB2A00088AD39BCF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4539,6 +4551,18 @@
<!--D135F503B3664D25A72A21D770422FA6--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--D135F503B3664D25A72A21D770422FA6--></AD_MESSAGE>
+<!--D189BFD003BE4448811CF517B4A14764--><AD_MESSAGE>
+<!--D189BFD003BE4448811CF517B4A14764--> <AD_MESSAGE_ID><![CDATA[D189BFD003BE4448811CF517B4A14764]]></AD_MESSAGE_ID>
+<!--D189BFD003BE4448811CF517B4A14764--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D189BFD003BE4448811CF517B4A14764--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D189BFD003BE4448811CF517B4A14764--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D189BFD003BE4448811CF517B4A14764--> <VALUE><![CDATA[OBPOS_BPartnerOnHold]]></VALUE>
+<!--D189BFD003BE4448811CF517B4A14764--> <MSGTEXT><![CDATA[It is not possible to select %0 because it is on hold.]]></MSGTEXT>
+<!--D189BFD003BE4448811CF517B4A14764--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D189BFD003BE4448811CF517B4A14764--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--D189BFD003BE4448811CF517B4A14764--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D189BFD003BE4448811CF517B4A14764--></AD_MESSAGE>
+
<!--D18CFF9A731E490EA3C1511DA6EF19AE--><AD_MESSAGE>
<!--D18CFF9A731E490EA3C1511DA6EF19AE--> <AD_MESSAGE_ID><![CDATA[D18CFF9A731E490EA3C1511DA6EF19AE]]></AD_MESSAGE_ID>
<!--D18CFF9A731E490EA3C1511DA6EF19AE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java b/src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java
--- a/src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java
@@ -44,6 +44,9 @@
add(new HQLProperty("bpl.businessPartner.creditLimit", "creditLimit"));
add(new HQLProperty("bpl.businessPartner.creditUsed", "creditUsed"));
add(new HQLProperty("bpl.businessPartner.taxExempt", "taxExempt"));
+ add(new HQLProperty("bpl.businessPartner.customerBlocking", "customerBlocking"));
+ add(new HQLProperty("bpl.businessPartner.salesOrder", "salesOrderBlocking"));
+
}
};
return list;
diff --git a/web/org.openbravo.retail.posterminal/js/components/businesspartner.js b/web/org.openbravo.retail.posterminal/js/components/businesspartner.js
--- a/web/org.openbravo.retail.posterminal/js/components/businesspartner.js
+++ b/web/org.openbravo.retail.posterminal/js/components/businesspartner.js
@@ -237,9 +237,13 @@
name: 'line',
style: 'line-height: 23px;',
components: [{
+ style: 'display: inline-block;',
name: 'identifier'
}, {
- style: 'color: #888888',
+ style: 'display: inline-block; font-weight: bold; color: red; padding-left:5px;',
+ name: 'onHold'
+ }, {
+ style: 'clear: left; color: #888888',
name: 'address'
}, {
style: 'clear: both;'
@@ -255,6 +259,9 @@
create: function () {
this.inherited(arguments);
this.$.identifier.setContent(this.model.get('_identifier'));
+ if (this.model.get('customerBlocking') && this.model.get('salesOrderBlocking')) {
+ this.$.onHold.setContent('(' + OB.I18N.getLabel('OBPOS_OnHold') + ')');
+ }
this.$.address.setContent(this.model.get('locName'));
}
});
@@ -324,9 +331,13 @@
this.bpsList = new Backbone.Collection();
this.$.stBPAssignToReceipt.setCollection(this.bpsList);
this.bpsList.on('click', function (model) {
- this.doChangeBusinessPartner({
- businessPartner: model
- });
+ if (model.get('customerBlocking') && model.get('salesOrderBlocking')) {
+ OB.UTIL.showError(OB.I18N.getLabel('OBPOS_BPartnerOnHold', [model.get('_identifier')]));
+ } else {
+ this.doChangeBusinessPartner({
+ businessPartner: model
+ });
+ }
}, this);
}
});
diff --git a/web/org.openbravo.retail.posterminal/js/model/businesspartner.js b/web/org.openbravo.retail.posterminal/js/model/businesspartner.js
--- a/web/org.openbravo.retail.posterminal/js/model/businesspartner.js
+++ b/web/org.openbravo.retail.posterminal/js/model/businesspartner.js
@@ -107,6 +107,8 @@
this.set('phone', null);
this.set('email', null);
this.set('taxExempt', null);
+ this.set('customerBlocking', null);
+ this.set('salesOrderBlocking', null);
} else {
_.each(_.keys(cusToLoad.attributes), function (key) {
if (cusToLoad.get(key) !== undf) {
@@ -249,6 +251,14 @@
name: 'taxExempt',
column: 'taxExempt',
type: 'TEXT'
+ }, {
+ name: 'customerBlocking',
+ column: 'customerBlocking',
+ type: 'TEXT'
+ }, {
+ name: 'salesOrderBlocking',
+ column: 'salesOrderBlocking',
+ type: 'TEXT'
}]);
BusinessPartner.addIndex([{
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/customersadvancedsearch.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/customersadvancedsearch.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/customersadvancedsearch.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/customersadvancedsearch.js
@@ -115,6 +115,9 @@
style: 'float: left; font-weight: bold;',
name: 'identifier'
}, {
+ style: 'float: left; padding-left:5px; font-weight: bold; color: red;',
+ name: 'onHold'
+ }, {
style: 'float: left;',
name: 'address'
}, {
@@ -123,8 +126,11 @@
}],
create: function () {
this.inherited(arguments);
- this.$.identifier.setContent(this.model.get('_identifier') + ' / ');
- this.$.address.setContent(this.model.get('locName'));
+ this.$.identifier.setContent(this.model.get('_identifier'));
+ if (this.model.get('customerBlocking') && this.model.get('salesOrderBlocking')) {
+ this.$.onHold.setContent(' (' + OB.I18N.getLabel('OBPOS_OnHold') + ') ');
+ }
+ this.$.address.setContent(' / ' + this.model.get('locName'));
}
});
@@ -380,15 +386,19 @@
this.$.stBPAdvSearch.setCollection(this.bpsList);
this.bpsList.on('click', function (model) {
var sw = this.subWindow;
- this.doChangeSubWindow({
- newWindow: {
- name: 'customerView',
- params: {
- navigateOnClose: sw.getName(),
- businessPartner: model
+ if (model.get('customerBlocking') && model.get('salesOrderBlocking')) {
+ OB.UTIL.showError(OB.I18N.getLabel('OBPOS_BPartnerOnHold', [model.get('_identifier')]));
+ } else {
+ this.doChangeSubWindow({
+ newWindow: {
+ name: 'customerView',
+ params: {
+ navigateOnClose: sw.getName(),
+ businessPartner: model
+ }
}
- }
- });
+ });
+ }
}, this);
}
});
|