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
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
Faris Ansari
79be8f969f
Add to patches.txt
2017-10-30 14:46:09 +05:30
ci2014
e741b91f1d
Update issue.js ( #11381 )
...
Make the close / reopen button more flexible for customized user status.
For example, if the user has several status, it will now show the Close button every time the ticket is not closed! It will show Reopen only, if the ticket is closed, and not if it's on hold for example.
This will make it more flexible.
2017-10-30 10:13:05 +05:30
tunde
5ea10a77a3
Merge branch 'develop' into payment-terms
2017-10-27 17:37:15 +01:00
Faris Ansari
638e3f9fa6
Merge pull request #11154 from netchampfaris/hub-item-image
...
[hub] fix company page routing
2017-10-27 17:07:10 +05:30
Saurabh
1bc8e32f94
Merge pull request #11360 from manassolanki/fix-fee-patch
...
fix the fee patch
2017-10-27 17:00:11 +05:30
Faris Ansari
8c1099d236
Add POS Profile User DocType
2017-10-27 16:48:07 +05:30
Manas Solanki
8637e52d4c
fix the fee patch
2017-10-27 11:55:15 +05:30
tunde
bbce7b7e5d
get attribute with get method
2017-10-26 14:31:13 +01:00
tunde
6575a615b1
get attribute with get method
2017-10-26 14:30:18 +01:00
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Faris Ansari
c83413134d
Merge pull request #11294 from revant/map_field_docs
...
[Docs] added field for storing map
2017-10-26 17:19:46 +05:30
Nabin Hait
c799a22d55
Merge branch 'master' into staging
2017-10-26 14:35:34 +05:30
Nabin Hait
edef9811f9
Merge branch 'master' into develop
2017-10-26 14:35:34 +05:30
Nabin Hait
92e09c0b7b
Merge branch 'hotfix'
2017-10-26 14:35:33 +05:30
Nabin Hait
819c50c042
bumped to version 9.2.2
2017-10-26 15:05:33 +06:00
Faris Ansari
6887cedaea
[fix] item qty trigger ( #11349 )
2017-10-26 14:34:15 +05:30
Nabin Hait
aa7896f1e1
[test] Fixed physician test cases ( #11347 )
2017-10-26 14:33:28 +05:30
Nabin Hait
52909b73bb
[test] Fixed advance jv cancellation ( #11333 )
2017-10-26 11:06:07 +05:30
Saurabh
b445633e56
Merge branch 'master' into staging
2017-10-26 09:59:22 +05:30
Saurabh
0d597cef8d
Merge branch 'master' into develop
2017-10-26 09:59:22 +05:30
Saurabh
5235aa833c
Merge branch 'hotfix'
2017-10-26 09:59:22 +05:30
Saurabh
d0131762cc
bumped to version 9.2.1
2017-10-26 10:29:22 +06:00
Saurabh
97b98b6c01
Merge pull request #11345 from saurabh6790/setup_wiz_fixes
...
[HOTFIX] translate domain
2017-10-26 09:52:45 +05:30
