2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-09-14 14:41:33 +00:00

Merging master and resolved conflict

This commit is contained in:
eeintech
2020-12-18 17:08:37 -05:00
37 changed files with 1890 additions and 1283 deletions

View File

@@ -160,11 +160,13 @@ class InvenTreeSetting(models.Model):
'SALESORDER_REFERENCE_PREFIX': {
'name': _('Sales Order Reference Prefix'),
'description': _('Prefix value for sales order reference'),
'default': 'SO',
},
'PURCHASEORDER_REFERENCE_PREFIX': {
'name': _('Purchase Order Reference Prefix'),
'description': _('Prefix value for purchase order reference'),
'default': 'PO',
},
}