Commit Graph

20313 Commits

Author SHA1 Message Date
rohitwaghchaure
6058dcc2ce
Merge pull request #11470 from rohitwaghchaure/pos_online_invalid_grand_total_issue
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
2017-11-07 16:19:51 +05:30
Rohit Waghchaure
35fc45eff9 [fix] POS Profile test cases 2017-11-07 10:43:16 +05:30
Rohit Waghchaure
57cc924d29 [Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart 2017-11-06 18:42:37 +05:30
Manas Solanki
36e2fb8d58 minor fixes in the fee module for print and permission, delete redundant doctype (#11430) 2017-11-06 17:44:59 +05:30
Nabin Hait
e552a51266 Minor cleanups 2017-11-06 17:39:31 +05:30
pawan
436f7b980c codacy issues 2017-11-06 17:39:31 +05:30
pawan
438dfc081b fix codacy issues 2017-11-06 17:39:30 +05:30
pawan
d59225635d remove old report 2017-11-06 17:39:30 +05:30
pawan
b699b86b76 Add Total Row 2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29 [fix] #11449 2017-11-06 17:39:30 +05:30
pawan
e61a275651 [fix] #11427 2017-11-06 17:39:30 +05:30
Manas Solanki
6ba2eda04a fixes for the chart (#11460) 2017-11-06 17:22:14 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +05:30
rohitwaghchaure
adbbb0b0f3
Merge pull request #11364 from manassolanki/set-pos-profile
set the pos profile in the sales invoice
2017-11-06 14:08:59 +05:30
Manas Solanki
40ef7e7039 patch for renaming the pos profile and setting the pos profile name 2017-11-06 13:53:52 +05:30
Manas Solanki
b1616a0cb3 changes in thepos profile 2017-11-06 13:53:52 +05:30
Manas Solanki
3f0dfd720f set the pos profile in the sales invoice 2017-11-06 13:53:52 +05:30
Nabin Hait
f15a8409eb
[tests] Test case fixes for task and project (#11445)
* [tests] Test case fixes for task and project

* Removed hard-coded dates from test cases

* Codacy fix
2017-11-06 11:11:34 +05:30
Saurabh
e850655c1d Merge branch 'master' into staging 2017-11-03 16:56:24 +05:30
Saurabh
5647bf081a Merge branch 'hotfix' 2017-11-03 16:56:23 +05:30
Saurabh
0faa61009f Merge branch 'master' into develop 2017-11-03 16:56:23 +05:30
Saurabh
56cb0aa9c1 bumped to version 9.2.4 2017-11-03 17:26:23 +06:00
Faris Ansari
cbaa0e629c fix codacy 2017-11-03 11:35:49 +05:30
Manas Solanki
76ce074c63 return the account details if and only if there is single account of that type (#11407) 2017-11-02 18:12:47 +05:30
rohitwaghchaure
7677ff00a2 [hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409) 2017-11-02 18:12:14 +05:30
Saurabh
62fd4007b0 Merge branch 'master' into staging 2017-11-02 12:14:42 +05:30
Saurabh
75f3f81a9b Merge branch 'hotfix' 2017-11-02 12:14:41 +05:30
Saurabh
3be72ef187 Merge branch 'master' into develop 2017-11-02 12:14:41 +05:30
Saurabh
870ce3cfea bumped to version 9.2.3 2017-11-02 12:44:40 +06:00
rohitwaghchaure
1473a37d8c
Merge pull request #11395 from jay-parikh/develop
POS - Add % to the Discount Field #9749
2017-11-02 12:11:12 +05:30
Saurabh
0ad2cc3def
Merge pull request #11403 from tundebabzy/issue-11402
Error In Employee Loan Form (#11402)
2017-11-02 12:09:54 +05:30
Saurabh
00f6c2d61d
Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9
[Fix] Customer is manadatory even if customer has selected in the Issue
2017-11-02 12:07:32 +05:30
Saurabh
38008f8daa
Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-02 12:07:14 +05:30
Saurabh
afb63af3b6
Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-11-02 12:06:08 +05:30
Rohit Waghchaure
816ce33daf [Fix] Customer is manadatory even if customer has selected in the Issue 2017-11-01 19:02:09 +05:30
rohitwaghchaure
69c6501842
Merge pull request #11399 from manassolanki/student-applicant
set the naming series from student admission and independent dob validation
2017-11-01 13:39:32 +05:30
Rohit Waghchaure
99748dbacf [Fix] Wrong difference amount in the payment entry for the internal transfer type 2017-11-01 11:45:02 +05:30
tunde
31287b00a6 call get_employee_loan_application only when appropriate 2017-10-31 18:10:17 +01:00
Faris Ansari
3d59179205 Load default pos profile if not found 2017-10-31 21:56:16 +05:30
Manas Solanki
a941a394ba set the naming series and independent dob validation 2017-10-31 17:34:50 +05:30
Rohit Waghchaure
5ec9f6930b [Fix] Getting an error while making delivery note from sales order and sales order has no item code 2017-10-31 15:26:56 +05:30
Jay Parikh
96f167573b POS - Add % to the Discount Field #9749 2017-10-31 01:07:09 -07:00
Zarrar
6d41a9a647 Converting Task to a Tree structure (#11117)
* added support for tree view

* nestedset added to handle tree based structure

* treeview ui added

* removed is_group dependency

* added validation while editing a group-task

* codacy fix

* BOM like filter added

* Added ui-test for treeview-task
2017-10-31 13:10:55 +05:30
Manas Solanki
160e710ebf set bank account only if there is single bank type account (#11363)
* set bank account only if there is single bank type account

* Update journal_entry.py
2017-10-31 13:04:02 +05:30
Faris Ansari
40611e4f69 [fix] hub get_item_details (#11383) 2017-10-31 13:00:09 +05:30
KanchanChauhan
21f946f365 [Minor] Source Warehouse should be filtered by Company in Production Order (#11376) 2017-10-31 12:59:45 +05:30
Prateeksha Singh
6b26e391b8 use the new frappe charts :D (#11391) 2017-10-31 12:58:48 +05:30
Saurabh
dd0bdc7fa6
Merge pull request #11356 from tundebabzy/issue-11355
fix object has not attribute 'is_item_from_hub'
2017-10-31 12:23:09 +05:30
Faris Ansari
895aa7b7ac fix codacy 2017-10-30 17:12:50 +05:30
Faris Ansari
2c8a309106
Merge branch 'develop' into multiple-users-pos-profile 2017-10-30 15:02:28 +05:30