Nabin Hait
c9e96c15af
Rate and amount in a single row in tax breakup
2017-09-12 15:45:49 +05:30
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
Sagar Vora
d54d6bc572
[fix] use stock_qty in reports instead of qty to match with stock_uom ( #10727 )
2017-09-12 11:31:10 +05:30
rohitwaghchaure
38830e54d8
[fix] No module namd student_batch_name.student_batch_name error in the patch ( #10745 )
2017-09-12 11:25:02 +05:30
Rohit Waghchaure
1a77922e85
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-12 11:01:48 +05:30
Makarand Bauskar
d0823adf42
[minor] translate the action name in get_slide_settings ( #10740 )
2017-09-12 10:52:24 +05:30
rohitwaghchaure
80b902cea6
Merge pull request #10732 from rohitwaghchaure/rename_pos_field_in_pos_settings
...
Rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 22:36:38 +05:30
Nabin Hait
e5716e3b1e
Default view of BOM is Listview
2017-09-11 19:21:47 +05:30
rohitwaghchaure
47605cae16
Merge pull request #10737 from nabinhait/budget_variance_for_project
...
[fix] Actual amount for budget variance report
2017-09-11 16:47:16 +05:30
Frappe PR Bot
8a803a2310
[Translation] Updated Translations ( #10741 )
2017-09-11 16:31:10 +05:30
rohitwaghchaure
e2149cb46f
Merge pull request #10697 from rohitwaghchaure/customer_search_optimization
...
[Fix] Customer search optimization for the offline POS
2017-09-11 16:23:15 +05:30
Nabin Hait
509bca36b1
Reverse charge in gst print format
2017-09-11 15:19:07 +05:30
Nabin Hait
cfb9310d13
Removed commit after creating custom gst fields
2017-09-11 15:00:16 +05:30
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
mbauskar
336c9b23d6
Merge branch 'master' into staging
2017-09-10 12:32:21 +05:30
mbauskar
dfeadf876e
Merge branch 'master' into develop
2017-09-10 12:32:21 +05:30
mbauskar
b9d158076e
Merge branch 'hotfix'
2017-09-10 12:32:20 +05:30
mbauskar
438088f69d
bumped to version 8.11.1
2017-09-10 13:02:20 +06:00
Makarand Bauskar
80b2ba2b9a
[hotfix] fixed Not Permitted issue for System user while accessing documents on portal ( #10725 )
...
* [hotfix] dont allow guest user to list the invoices or orders
* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal
* [codecy] removed trailing whitespace
* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
Faris Ansari
197901108e
Merge pull request #10713 from mbauskar/hotfix
...
[fix] Tax area alignment (#10690 )
2017-09-08 15:59:19 +05:30
Faris Ansari
425f1df799
[fix] Tax area alignment ( #10690 )
2017-09-08 15:56:34 +05:30
mbauskar
9bc2b66e14
Merge branch 'develop' into staging
2017-09-07 21:08:26 +05:30
Nabin Hait
d4e57a38a4
Fixed multiple ui test cases
2017-09-07 19:16:38 +05:30
Rohit Waghchaure
06b22e9ac1
[Fix] Customer search optimization for the offline POS
2017-09-07 17:44:42 +05:30
rohitwaghchaure
07b713121b
Merge pull request #10600 from netchampfaris/pos-refactor
...
POS Online
2017-09-07 17:39:45 +05:30
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
Vishal Dhayagude
c79d14190f
[fix] travis failed ( #10702 )
2017-09-07 16:05:41 +05:30
Rushabh Mehta
2e8e5354e9
[fix] trainig_feedback.py
2017-09-07 10:43:36 +05:30
Rushabh Mehta
290e066633
[rename] /test_training_event_attendance.js
2017-09-07 09:07:15 +05:30
Rushabh Mehta
134d59949a
[minor] update warehouse_group in item.reorder_levels
2017-09-07 09:04:24 +05:30
Prateeksha Singh
2697e332f3
[fix] wizard UI test order ( #10663 )
...
* [fix] wizard ui test order
* [setup] remove old test
* [fix] commit to remove lock from defaults table during setup
2017-09-07 09:03:16 +05:30
Rohit Waghchaure
c72d08e8b9
Added indicator to show stock is available or not
2017-09-06 14:56:08 +05:30
rohitwaghchaure
ec46e51ed4
Merge pull request #10426 from nabinhait/payment_entry_deductions
...
Unallocated and difference amount calculation in Payment Entry
2017-09-06 13:04:25 +05:30
Rohit Waghchaure
7419c4b577
Fixed test cases
2017-09-06 12:44:51 +05:30
rohitwaghchaure
914fd197fc
Update test_payment_against_invoice.js
2017-09-06 12:42:58 +05:30
Faris Ansari
8868ae22be
[fix] Tax area alignment ( #10690 )
2017-09-06 12:17:12 +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
Rushabh Mehta
6ef741554c
[fix] [patch] rename_company_sales_target_field.py
2017-09-06 10:53:26 +05:30
mbauskar
668d04548a
Merge branch 'master' into develop
2017-09-05 20:45:00 +05:30
mbauskar
68a4146999
Merge branch 'staging'
2017-09-05 20:44:59 +05:30
mbauskar
d4316f0264
bumped to version 8.11.0
2017-09-05 21:14:58 +06:00
Faris Ansari
4bcaeb312c
fix codacy
2017-09-05 17:30:22 +05:30
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
Faris Ansari
62b1dc777e
Namespace PointOfSale class
2017-09-05 17:10:24 +05:30
Nabin Hait
799619b6b0
Fixed multiple uom in selling
2017-09-05 15:52:12 +05:30
Makarand Bauskar
3ad045302b
[minor] set abbreviation on company name trigger ( #10671 )
...
* [minor] set abbreviation on company name trigger
* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc
Test case fixed for multi-currency and multi-uom BOM ( #10679 )
2017-09-05 15:16:32 +05:30