tunde
c02f332565
Merge branch 'develop' into payment-terms
2017-09-20 15:37:34 +01:00
tunde
35c84fe4f2
fix failing test case
2017-09-20 12:26:19 +01:00
Nabin Hait
b2dca79d89
Updated modified timestamp in sales/purchase transaction doctypes
2017-09-20 09:56:06 +05:30
tunde
4712ed6377
remove logging statement
2017-09-19 21:30:34 +01:00
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
tunde
da17954919
fix failing tests
2017-09-19 17:53:31 +01:00
Manas Solanki
1bcc6c661a
minor changes
2017-09-19 17:23:03 +05:30
Manas Solanki
9b44c16a32
add the fee schedule in config
2017-09-19 17:23:03 +05:30
Manas Solanki
1299d56e85
cleanup of the fee module
2017-09-19 17:23:03 +05:30
Manas Solanki
152ba1eccb
fixes as per the review
2017-09-19 17:23:03 +05:30
Manas Solanki
4e0559bc79
make payment entry for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
2b39d5d6d5
make gl_entry on submission of fees
2017-09-19 17:23:02 +05:30
Manas Solanki
e4acf763a5
make payment request for the fee
2017-09-19 17:23:02 +05:30
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
rohitwaghchaure
850eaa73b0
Move subscription module to accounts ( #10772 )
2017-09-18 17:23:00 +05:30
Nabin Hait
e859671eb3
Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )" ( #10830 )
...
This reverts commit d258372f9e50a9d94321dfba0abbbb24fcee7d62.
2017-09-18 17:22:46 +05:30
Neil Trini Lasrado
d258372f9e
Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )
2017-09-18 17:12:16 +05:30
Utkarsh Goswami
b98359f4a7
Payment entry ( #10668 )
2017-09-18 17:06:13 +05:30
Neil Trini Lasrado
8c9f2a1be6
Add communication entry to Sales Order only if payment entry email is sent to customer ( #10716 )
2017-09-18 16:41:49 +05:30
Nabin Hait
9744aa21af
Minor fix in tax rule
2017-09-18 15:25:33 +05:30
rohitwaghchaure
70ef09aa8f
Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue
...
[fix] Test cases for tax rule
2017-09-16 22:55:16 +05:30
Rohit Waghchaure
2cb2064c6f
Fixed test cases tax rule
2017-09-15 23:10:27 +05:30
Nabin Hait
21617da619
More fixes for UI tests
2017-09-15 21:22:16 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
rohitwaghchaure
225ac0dac3
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-08 10:31:21 +01:00
tunde
24cb494a3b
Revert "Revert "make payment_schedule field no-copy""
...
This reverts commit fbd895d781b2718b35775fa36094c594c2b7ff89.
2017-09-08 10:07:39 +01:00
tunde
fbd895d781
Revert "make payment_schedule field no-copy"
...
This reverts commit 4f4148b0dae5678e34d0d3285997e2b3f4d4f307.
2017-09-08 10:06:46 +01:00
tunde
199daf7ac5
Merge branch 'develop' into payment-terms
2017-09-08 09:59:13 +01:00
tunde
4f4148b0da
make payment_schedule field no-copy
2017-09-07 18:49:10 +01:00
tunde
2d3a575f29
more test cases for purchase/sales invoice
2017-09-07 14:50:20 +01:00
tunde
b0f6b068ef
remove test based on deleted recurring_document.py
2017-09-07 13:50:46 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
tunde
353099d7ad
Merge branch 'develop' into payment-terms
2017-09-07 11:31:26 +01:00
tunde
788de8001c
more tests
2017-09-07 11:30:06 +01:00
tunde
e7da1c5500
refactor: DRY for disable due date logic
2017-09-06 12:36:45 +01:00
rohitwaghchaure
914fd197fc
Update test_payment_against_invoice.js
2017-09-06 12:42:58 +05:30
Nabin Hait
ded8d11728
Js tests added for write off difference amount
2017-09-06 12:11:48 +05:30
Nabin Hait
6c3618be37
Unallocated and difference amount calculation in Payment Entry
2017-09-06 12:10:52 +05:30
tunde
8173239f63
Merge branch 'develop' into payment-terms
2017-09-06 04:18:40 +01:00
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
Nabin Hait
799619b6b0
Fixed multiple uom in selling
2017-09-05 15:52:12 +05:30
tunde
7f9a462506
Merge branch 'develop' into payment-terms
2017-09-05 01:35:51 +01:00
tunde
2fdb857fed
fix due date disable bug
2017-09-05 00:21:54 +01:00
tunde
635423d70f
rewrite Supplier test cases
2017-09-04 19:37:54 +01:00
Rohit Waghchaure
6ab630371d
Fixed serial no trigger not working from dialog box
2017-09-01 17:02:42 +05:30
tunde
cbd72f6113
adjust failing tests
2017-09-01 11:48:00 +01:00
