Merge branch 'develop' of https://github.com/frappe/erpnext into develop

This commit is contained in:
Nabin Hait 2018-05-08 16:34:35 +05:30
commit b2800eeb2a
9 changed files with 10 additions and 10 deletions

View File

@ -30,7 +30,7 @@ def get_data():
},
{
'label': _('Subscription'),
'items': ['Subscription']
'items': ['Auto Repeat']
},
]
}

View File

@ -29,7 +29,7 @@ def get_data():
},
{
'label': _('Subscription'),
'items': ['Subscription']
'items': ['Auto Repeat']
},
]
}

View File

@ -24,7 +24,7 @@ def get_data():
},
{
'label': _('Reference'),
'items': ['Material Request', 'Supplier Quotation', 'Project', 'Subscription']
'items': ['Material Request', 'Supplier Quotation', 'Project', 'Auto Repeat']
},
{
'label': _('Sub-contracting'),

View File

@ -22,7 +22,7 @@ def get_data():
},
{
'label': _('Subscription'),
'items': ['Subscription']
'items': ['Auto Repeat']
},
]

View File

@ -34,8 +34,8 @@ def get_data():
},
{
"type": "doctype",
"name": "Subscription",
"label": _("Subscription"),
"name": "Auto Repeat",
"label": _("Auto Repeat"),
"description": _("To make recurring documents")
},
{

View File

@ -13,7 +13,7 @@ def get_data():
},
{
'label': _('Subscription'),
'items': ['Subscription']
'items': ['Auto Repeat']
},
]
}

View File

@ -32,7 +32,7 @@ def get_data():
},
{
'label': _('Reference'),
'items': ['Quotation', 'Subscription']
'items': ['Quotation', 'Auto Repeat']
},
{
'label': _('Payment'),

View File

@ -26,7 +26,7 @@ def get_data():
},
{
'label': _('Subscription'),
'items': ['Subscription']
'items': ['Auto Repeat']
},
]
}

View File

@ -28,7 +28,7 @@ def get_data():
},
{
'label': _('Subscription'),
'items': ['Subscription']
'items': ['Auto Repeat']
},
]
}