tundebabzy
|
d9fec69a70
|
update test case, fix bugs
|
2018-03-01 05:34:02 +01:00 |
|
tundebabzy
|
8f37926ca8
|
add ability to cancel, restart and refresh subscription
|
2018-03-01 04:57:23 +01:00 |
|
Achilles Rasquinha
|
45522327b9
|
Merge pull request #13137 from achillesrasquinha/py3
Fix unittest
|
2018-02-28 22:01:35 +05:30 |
|
Achilles Rasquinha
|
646522886c
|
self.assertEqual
|
2018-02-28 21:13:51 +05:30 |
|
Shreya Shah
|
a310cc7156
|
order by modified instead of item name (#13113)
|
2018-02-28 18:59:55 +05:30 |
|
Ameya Shenoy
|
c20901443e
|
updated develop_version to 11 (#13133)
|
2018-02-28 17:38:23 +05:30 |
|
tundebabzy
|
2cccad0274
|
more tests and quick fix
|
2018-02-28 12:45:09 +01:00 |
|
tundebabzy
|
a5bc057ad4
|
adds missing 'translatability'
|
2018-02-28 12:24:16 +01:00 |
|
tundebabzy
|
86ee455cbc
|
more tests and bug fix
|
2018-02-28 12:21:08 +01:00 |
|
tundebabzy
|
b3d5777e55
|
more test cases and bug fixes
|
2018-02-28 12:11:19 +01:00 |
|
Achilles Rasquinha
|
96698c9a77
|
Use range instead xrange (#13128)
* Use range instead of xrange
* convert float to int
|
2018-02-28 16:12:51 +05:30 |
|
Faris Ansari
|
72d8509b3d
|
python 3 fix (#13127)
|
2018-02-28 12:53:34 +05:30 |
|
tundebabzy
|
3aaf693abd
|
adds task -process
|
2018-02-28 05:12:18 +01:00 |
|
tundebabzy
|
95a4ca9429
|
update test cases
|
2018-02-27 18:09:06 +01:00 |
|
tundebabzy
|
9bf029a16e
|
generate new invoice only when current_invoice_end is past
|
2018-02-27 15:19:02 +01:00 |
|
Achilles Rasquinha
|
11a5f78d3e
|
Merge pull request #13070 from achillesrasquinha/py3
[FIX] sorting multiple compares
|
2018-02-27 19:48:25 +05:30 |
|
tundebabzy
|
45b6a1719f
|
refactor:
- current_invoice _start and end should be determined by trial period or billing period
- adds new functions to get billing period data
|
2018-02-27 15:14:19 +01:00 |
|
tundebabzy
|
c634ca8737
|
adds validation to billing_interval_count in Subscription Plan
|
2018-02-27 14:12:39 +01:00 |
|
Nabin Hait
|
3b43c0d160
|
Update territory and customer_group patch optimization (#13076)
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
|
2018-02-27 15:57:14 +05:30 |
|
Zarrar
|
96002c28bd
|
optimize patch for faster execution (#13068)
|
2018-02-27 15:57:01 +05:30 |
|
Zarrar
|
91fc1a8fbe
|
Update Territory & Customer Group across all transaction (#13004)
* added method for update query based on changes
* patch added
* updated function, moved util function
|
2018-02-27 15:56:38 +05:30 |
|
tundebabzy
|
3c26a7e862
|
adjusts query so multiple plans can be used to create single invoice
|
2018-02-27 09:36:29 +01:00 |
|
tundebabzy
|
559d01e176
|
allows to rename subscription plan
|
2018-02-27 09:13:35 +01:00 |
|
tundebabzy
|
07313c281a
|
adds more assertions to test cases
|
2018-02-27 09:00:13 +01:00 |
|
Ameya Shenoy
|
3ee22f0137
|
rename valid_email to validate_email (#13103)
|
2018-02-27 12:59:12 +05:30 |
|
rohitwaghchaure
|
f1755fb5b1
|
Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1
[Hotfix] POS discount issue
|
2018-02-27 11:58:33 +05:30 |
|
Manas Solanki
|
be841ccc53
|
Merge pull request #13096 from manassolanki/fix-fee-schedule
Fixes in the Fees Schedule
|
2018-02-27 11:23:38 +05:30 |
|
Frappe PR Bot
|
c6e2d750bb
|
[Translation] Updated Translations (#13097)
|
2018-02-27 11:00:59 +05:30 |
|
Zarrar
|
033eb779d4
|
minor fixes for member (#13101)
|
2018-02-27 11:00:47 +05:30 |
|
tundebabzy
|
048bcbf080
|
more tests and code fixes
|
2018-02-26 22:17:06 +01:00 |
|
tundebabzy
|
b84e9519c2
|
Subscriptions doctype - subscriber should be set only once
|
2018-02-26 20:35:20 +01:00 |
|
tundebabzy
|
1ea5055967
|
fix another date comparison bug
|
2018-02-26 20:17:59 +01:00 |
|
tundebabzy
|
4d8175f9d9
|
adds test cases and fix resulting bugs
|
2018-02-26 18:56:05 +01:00 |
|
tundebabzy
|
cd700efc0b
|
only generate invoice after_insert if subscription is not in trial period
|
2018-02-26 16:26:36 +01:00 |
|
tundebabzy
|
0091c86e80
|
fix date comparison bug
|
2018-02-26 16:18:55 +01:00 |
|
tundebabzy
|
08a11b4d1f
|
sets default for days_until_due to 0
|
2018-02-26 16:13:45 +01:00 |
|
tundebabzy
|
d3fdcd9da5
|
set after_insert methods:
- if subscription is not in trial period, generate sales invoice
|
2018-02-26 16:10:47 +01:00 |
|
tundebabzy
|
b72aac6729
|
adds validation:
- ensure trial period dates are in order
|
2018-02-26 15:56:47 +01:00 |
|
tundebabzy
|
7a2c6df645
|
sets Subscription doc status in before_save
|
2018-02-26 15:55:32 +01:00 |
|
tundebabzy
|
3010996cc5
|
adds before_insert methods:
- set current_invoice_start
- set current_invoice_end
|
2018-02-26 15:51:32 +01:00 |
|
tundebabzy
|
35e92c7d29
|
removes start field from Subscriptions
|
2018-02-26 15:25:26 +01:00 |
|
Manas Solanki
|
51dfba749b
|
filter students on basis of category and button to show fees
|
2018-02-26 19:32:26 +05:30 |
|
tundebabzy
|
6e014331c5
|
removes end_date from Subscriptions doctype
|
2018-02-26 14:05:54 +01:00 |
|
tundebabzy
|
2b5298238e
|
adds prorate field to Subscription Settings
|
2018-02-26 13:58:29 +01:00 |
|
tundebabzy
|
2dee342501
|
Subscriptions doctype - trial start and end are set_only_once
|
2018-02-26 13:34:25 +01:00 |
|
Nabin Hait
|
3799f8bec9
|
Don't validate serial nos while cancelling the transaction
|
2018-02-26 16:39:06 +05:30 |
|
Zarrar
|
e53a238665
|
minor fix (#13095)
|
2018-02-26 15:59:20 +05:30 |
|
Shreya Shah
|
70a57e08fd
|
New Report Employee Advance Summary (#13040)
* New Report Employee Advance Summary
* JSON style column definition
|
2018-02-26 15:58:57 +05:30 |
|
tundebabzy
|
cbe4f5b6b3
|
changes to subscription settings
|
2018-02-26 11:22:53 +01:00 |
|
tundebabzy
|
066958a794
|
subscription_invoice doctype changes
|
2018-02-26 11:22:05 +01:00 |
|