Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move subscription module to accounts #10772

Merged
merged 1 commit into from
Sep 15, 2017
Merged

Move subscription module to accounts #10772

merged 1 commit into from
Sep 15, 2017

Conversation

rohitwaghchaure
Copy link
Collaborator

@rohitwaghchaure rohitwaghchaure commented Sep 13, 2017 •
edited
Loading

  • Move to "Accounts"
  • Link in module/Accounts
  • Move documentation in Accounts
  • Status = 'Active' / 'Stopped'
  • Custom button for 'Stop', 'Resume'
  • Remove Cancel Permission

Fixed #10759, #10760

@rohitwaghchaure rohitwaghchaure force-pushed the subscription_v9_issue branch 4 times, most recently from 21ef9b3 to 1b75ae8 Compare September 13, 2017 10:56
mnatalia
mnatalia reviewed Sep 13, 2017
View reviewed changes
erpnext/templates/emails/recurring_document_failed.html
@@ -2,11 +2,10 @@

<p>An error occured while creating recurring {{ type }} <b>{{ name }}</b> for <b>{{ party }}</b>.</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a question, don't you think it should be possible to translate this message?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your review, will fix it!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry again but I think all sentences in the recurring_document_failed.html should have possibility to be translated

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please send PR after merging of this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@rohitwaghchaure rohitwaghchaure force-pushed the subscription_v9_issue branch 3 times, most recently from d44d697 to 91c8034 Compare September 14, 2017 08:14
@mbauskar mbauskar merged commit dd092e3 into frappe:staging Sep 15, 2017
rohitwaghchaure added a commit to rohitwaghchaure/erpnext_develop that referenced this pull request Sep 18, 2017
@rohitwaghchaure
Move subscription module to accounts (frappe#10772)
850eaa7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mnatalia mnatalia mnatalia left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rohitwaghchaure @mnatalia @mbauskar