diff --git a/src-db/database/model/tables/OBPOS_APPLICATIONS.xml b/src-db/database/model/tables/OBPOS_APPLICATIONS.xml
--- a/src-db/database/model/tables/OBPOS_APPLICATIONS.xml
+++ b/src-db/database/model/tables/OBPOS_APPLICATIONS.xml
@@ -117,6 +117,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="DOCUMENTNO_PADDING" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[7]]></default>
+        <onCreateDefault><![CDATA[7]]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBPOS_APP_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -7659,6 +7659,43 @@
 <!--7057B1DDEE9B473B97330448635914D1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7057B1DDEE9B473B97330448635914D1--></AD_COLUMN>
 
+<!--707DBE725BBF46C9A2DE9ABB279C2709--><AD_COLUMN>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_COLUMN_ID><![CDATA[707DBE725BBF46C9A2DE9ABB279C2709]]></AD_COLUMN_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <NAME><![CDATA[Documentno_Padding]]></NAME>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <COLUMNNAME><![CDATA[Documentno_Padding]]></COLUMNNAME>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_TABLE_ID><![CDATA[FF80818132F311740132F31E2C9A0016]]></AD_TABLE_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <DEFAULTVALUE><![CDATA[7]]></DEFAULTVALUE>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <SEQNO><![CDATA[540]]></SEQNO>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_ELEMENT_ID><![CDATA[D814B14F0A4C4F73B8FAD54F8B373475]]></AD_ELEMENT_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <POSITION><![CDATA[35]]></POSITION>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--707DBE725BBF46C9A2DE9ABB279C2709-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--707DBE725BBF46C9A2DE9ABB279C2709--></AD_COLUMN>
+
 <!--71CD455F6B794AA8BA469AC19370E261--><AD_COLUMN>
 <!--71CD455F6B794AA8BA469AC19370E261-->  <AD_COLUMN_ID><![CDATA[71CD455F6B794AA8BA469AC19370E261]]></AD_COLUMN_ID>
 <!--71CD455F6B794AA8BA469AC19370E261-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -2203,6 +2203,18 @@
 <!--D30575FF9AC54E8CA097907CACD84506-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D30575FF9AC54E8CA097907CACD84506--></AD_ELEMENT>
 
+<!--D814B14F0A4C4F73B8FAD54F8B373475--><AD_ELEMENT>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <AD_ELEMENT_ID><![CDATA[D814B14F0A4C4F73B8FAD54F8B373475]]></AD_ELEMENT_ID>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <COLUMNNAME><![CDATA[Documentno_Padding]]></COLUMNNAME>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <NAME><![CDATA[Order Document No Padding]]></NAME>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <PRINTNAME><![CDATA[Order Document No Padding]]></PRINTNAME>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--D814B14F0A4C4F73B8FAD54F8B373475-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D814B14F0A4C4F73B8FAD54F8B373475--></AD_ELEMENT>
+
 <!--D8B91E953CE646B095825A35575C7BEA--><AD_ELEMENT>
 <!--D8B91E953CE646B095825A35575C7BEA-->  <AD_ELEMENT_ID><![CDATA[D8B91E953CE646B095825A35575C7BEA]]></AD_ELEMENT_ID>
 <!--D8B91E953CE646B095825A35575C7BEA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -6105,6 +6105,32 @@
 <!--A0D6BD04FAB24472B53450AA128C81D7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A0D6BD04FAB24472B53450AA128C81D7--></AD_FIELD>
 
+<!--A13F10F5741143399CF1B36B9736E878--><AD_FIELD>
+<!--A13F10F5741143399CF1B36B9736E878-->  <AD_FIELD_ID><![CDATA[A13F10F5741143399CF1B36B9736E878]]></AD_FIELD_ID>
+<!--A13F10F5741143399CF1B36B9736E878-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A13F10F5741143399CF1B36B9736E878-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A13F10F5741143399CF1B36B9736E878-->  <NAME><![CDATA[Order Document No Padding]]></NAME>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A13F10F5741143399CF1B36B9736E878-->  <AD_TAB_ID><![CDATA[FF80818132F311740132F3233778004B]]></AD_TAB_ID>
+<!--A13F10F5741143399CF1B36B9736E878-->  <AD_COLUMN_ID><![CDATA[707DBE725BBF46C9A2DE9ABB279C2709]]></AD_COLUMN_ID>
+<!--A13F10F5741143399CF1B36B9736E878-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A13F10F5741143399CF1B36B9736E878-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A13F10F5741143399CF1B36B9736E878-->  <SEQNO><![CDATA[197]]></SEQNO>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A13F10F5741143399CF1B36B9736E878-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A13F10F5741143399CF1B36B9736E878-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--A13F10F5741143399CF1B36B9736E878-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A13F10F5741143399CF1B36B9736E878-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A13F10F5741143399CF1B36B9736E878-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A13F10F5741143399CF1B36B9736E878-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A13F10F5741143399CF1B36B9736E878--></AD_FIELD>
+
 <!--A19528CA2F014A5CBA1AD37425E83C45--><AD_FIELD>
 <!--A19528CA2F014A5CBA1AD37425E83C45-->  <AD_FIELD_ID><![CDATA[A19528CA2F014A5CBA1AD37425E83C45]]></AD_FIELD_ID>
 <!--A19528CA2F014A5CBA1AD37425E83C45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/term/TerminalProperties.java b/src/org/openbravo/retail/posterminal/term/TerminalProperties.java
--- a/src/org/openbravo/retail/posterminal/term/TerminalProperties.java
+++ b/src/org/openbravo/retail/posterminal/term/TerminalProperties.java
@@ -75,6 +75,7 @@
     list.add(new HQLProperty("postype", "terminalType"));
     list.add(new HQLProperty("pos.printoffline", "printoffline"));
     list.add(new HQLProperty("pos.ismaster", "ismaster"));
+    list.add(new HQLProperty("pos.documentnoPadding", "documentnoPadding"));
     list.add(new HQLProperty(
         "CASE WHEN pos.masterterminal.id is not null THEN true ELSE false END", "isslave"));
     list.add(new HQLProperty("'" + OBContext.getOBContext().getLanguage().getLanguage() + "'",
diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -1140,7 +1140,7 @@
       var next = this.getLastDocumentnoSuffixInOrderlist() + 1;
       return {
         documentnoSuffix: next,
-        documentNo: OB.MobileApp.model.get('terminal').docNoPrefix + (OB.Model.Order.prototype.includeDocNoSeperator ? '/' : '') + OB.UTIL.padNumber(next, 7)
+        documentNo: OB.MobileApp.model.get('terminal').docNoPrefix + (OB.Model.Order.prototype.includeDocNoSeperator ? '/' : '') + OB.UTIL.padNumber(next, OB.MobileApp.model.get('terminal').documentnoPadding)
       };
     },
     // call this method to get a new quotation document number
@@ -1148,7 +1148,7 @@
       var next = this.getLastQuotationnoSuffixInOrderlist() + 1;
       return {
         quotationnoSuffix: next,
-        documentNo: OB.MobileApp.model.get('terminal').quotationDocNoPrefix + (OB.Model.Order.prototype.includeDocNoSeperator ? '/' : '') + OB.UTIL.padNumber(next, 7)
+        documentNo: OB.MobileApp.model.get('terminal').quotationDocNoPrefix + (OB.Model.Order.prototype.includeDocNoSeperator ? '/' : '') + OB.UTIL.padNumber(next, OB.MobileApp.model.get('terminal').documentnoPadding)
       };
     },
     // call this method to get a new Return document number
@@ -1156,7 +1156,7 @@
       var next = this.getLastReturnnoSuffixInOrderlist() + 1;
       return {
         documentnoSuffix: next,
-        documentNo: OB.MobileApp.model.get('terminal').returnDocNoPrefix + (OB.Model.Order.prototype.includeDocNoSeperator ? '/' : '') + OB.UTIL.padNumber(next, 7)
+        documentNo: OB.MobileApp.model.get('terminal').returnDocNoPrefix + (OB.Model.Order.prototype.includeDocNoSeperator ? '/' : '') + OB.UTIL.padNumber(next, OB.MobileApp.model.get('terminal').documentnoPadding)
       };
     },
 
