rohitwaghchaure
0eb8bb2511
[Fix] Wrong salary slips showing when click on view salary slips from payroll entry ( #13152 )
2018-03-05 11:03:27 +05:30
rohitwaghchaure
67cfa81de2
[Fix] Stock Ageing report does not work with group warehouse ( #13151 )
2018-03-05 11:00:42 +05:30
tundebabzy
458a1fe61a
codacy
2018-03-03 18:11:48 +01:00
tundebabzy
ef605d5f00
codacy
2018-03-03 18:03:04 +01:00
tundebabzy
3b1251ef47
codacy tinzz
2018-03-03 17:36:07 +01:00
tundebabzy
2379451b68
codacy tinzz
2018-03-03 17:18:47 +01:00
tundebabzy
fbdd5d30e9
more tests and bug fixes
2018-03-03 11:19:18 +01:00
tundebabzy
024c28acf7
fix proration logic to reduce possibility of rounding errors
2018-03-03 10:32:02 +01:00
tundebabzy
79a01561d5
enhancement: do nothing if cancel_sbscription is called for cancelled subscription
2018-03-03 07:39:44 +01:00
tundebabzy
d43422c18e
enhancement: ensure subscription is cancelled before attempting to restart
2018-03-03 07:37:59 +01:00
tundebabzy
e13570f343
codacy review
2018-03-02 12:27:12 +01:00
tundebabzy
9e863b9572
Merge branch 'develop' into new-subscription
2018-03-02 11:10:27 +01:00
tundebabzy
c15dc21b7d
clean up
2018-03-02 11:00:15 +01:00
tundebabzy
49d34df8f4
more tests
2018-03-02 10:16:57 +01:00
tundebabzy
688fd6b205
prorate invoice when cancelling subscription
2018-03-02 10:16:42 +01:00
tundebabzy
4499e5351c
add article
2018-03-02 06:51:33 +01:00
tundebabzy
16afa8765e
tiny refactor of invoice setting logic
2018-03-01 17:16:41 +01:00
tundebabzy
9df4f0bd43
fix: apply_discount_on field should be of type Select not Data
2018-03-01 17:12:43 +01:00
tundebabzy
8670c85827
make sure default apply_discount_on is set when creating invoice
2018-03-01 17:11:14 +01:00
tundebabzy
ca5cf35a99
fix: task should explicitly call commit and rollback if error
2018-03-01 17:06:39 +01:00
tundebabzy
36c18c913e
docstrings
2018-03-01 16:44:10 +01:00
tundebabzy
0ec445214c
hook to hourly scheduler
2018-03-01 11:54:32 +01:00
tundebabzy
78fb12663a
fix test
2018-03-01 11:27:48 +01:00
tundebabzy
b91ec79494
update tests and more tweaks
2018-03-01 10:47:00 +01:00
tundebabzy
7eabbd93e1
update start date alone after restarting subscription
2018-03-01 09:09:23 +01:00
tundebabzy
2a11c18383
set initial invoice period based on subscription start
2018-03-01 08:47:38 +01:00
tundebabzy
a93fa16bce
freeze screen while waiting for updates on subscription
2018-03-01 08:45:56 +01:00
rohitwaghchaure
a942722619
[Fix] Timeout issue while saving multilevel BOM ( #13118 )
2018-03-01 13:15:25 +05:30
tundebabzy
328adedbc8
adds start field to record subscrption start date
2018-03-01 08:45:01 +01:00
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe ( #13130 )
...
* editable unallocated amount in payment entry to handle multi currency
* set unallocated amount on server side
* some minor fixes
* Fixes in territory patch
* removed print
* minor fixes
2018-03-01 13:14:14 +05:30
rohitwaghchaure
4badb45ee5
Merge pull request #13139 from rohitwaghchaure/sales_invoice_email_propmt_issue
...
[Fix] Sales invoice email prompt not working
2018-03-01 13:07:31 +05:30
Rohit Waghchaure
855d843e55
[Fix] Sales invoice email prompt not working
2018-03-01 13:06:01 +05:30
Harsh Patel
5bebbbe7a9
[Feature] Supplier warehouse link field on purchase order ( #13051 )
...
* Multiple Features:
[New] Supplier warehouse link field on purchase order for sub-contracting
[New] Auto select supplier warehouse while making purchase receipt from purchase order
* Set default to_warehouse in stock entry as the supplier warehouse
2018-03-01 11:33:25 +05:30
rohitwaghchaure
0df95fa781
Multi-UOM for sales/purchase return ( #13132 )
...
* Multi-UOM for sales/purchase return
* Update sales_and_purchase_return.py
2018-03-01 11:31:33 +05:30
Charles-Henri Decultot
bc7a549fdb
Gocardless integration ( #13008 )
...
* GoCardless integration
* Addition of a method for determining if the email should be sent or not
* Correction for Tests
* Codacy fix
* Documents moved to ERPNext
* Codacy fix
* Codacy fixes
* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Zarrar
6578bc11b6
wrong query formed to delete events ( #13119 )
2018-03-01 10:54:55 +05:30
Nabin Hait
f68dc69078
Set auto created serial nos in incoming transactions in case of multi UOM ( #13112 )
...
* Create user from Employee
* Set auto created serial nos in incoming transactions in case of multi uom
2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5
Make Expense Claim from Employee Advance #13053 ( #13074 )
...
* allow to make expense claim from employee advance
* make expense claim only if claimed amount < paid_amount
* expense claim made from employee advance is paid
2018-03-01 10:50:45 +05:30
Zarrar
502af4dd67
display image fnd description for root BOM also ( #13099 )
2018-03-01 10:44:47 +05:30
rohitwaghchaure
db9fa78ee8
Do not validate payment schedule for POS ( #13115 )
2018-03-01 10:32:29 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero ( #13129 )
...
* Don't overwrite start and end date comes from payroll entry
* Get valuation rate from historical SLE even if it is zero, if records exists
* Valid till should be autoset if not any default value
* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
rohitwaghchaure
332a17ee86
[Fix] Test case for serial no ( #13136 )
2018-03-01 10:28:04 +05:30
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
