Commit Graph

16769 Commits

Author SHA1 Message Date
Nabin Hait
0f9d60099d Merge pull request #6692 from neilLasrado/develop
Typo fix
2016-10-24 16:46:27 +05:30
Nabin Hait
a02fb1541a Merge pull request #6553 from saurabh6790/scrap_management
Scrap management
2016-10-24 16:46:13 +05:30
Nabin Hait
1f3771cdf1 Merge pull request #6687 from KanchanChauhan/lead-changes
Contact by and contact date validations
2016-10-24 16:44:08 +05:30
Rohit Waghchaure
43b508089e [Fix] Pricing rule discount issue 2016-10-24 16:16:24 +05:30
Neil Trini Lasrado
5ddd7acdbd Typo fix 2016-10-24 15:25:47 +05:30
Saurabh
8c3764a6ef test case for scrap item 2016-10-24 13:55:36 +05:30
Saurabh
4ae4eb0eb9 added get_scrap_items param to get_bom_items_as_dict 2016-10-24 13:55:36 +05:30
Saurabh
5a2fa8aac7 [enhance] scrap management 2016-10-24 13:55:36 +05:30
Saurabh
464c27e189 [feature] scrap management 2016-10-24 13:55:36 +05:30
Kanchan Chauhan
a1cedbc7b2 Contact by and contact date validations 2016-10-24 13:51:13 +05:30
Nabin Hait
cf397d3190 Merge pull request #6688 from frappe/umairsy-patch-5
Update domainify.py
2016-10-24 13:43:57 +05:30
Umair Sayed
a56775ce9a Update domainify.py 2016-10-24 13:00:17 +05:30
Nabin Hait
f430d73daf Merge pull request #6662 from PawanMeh/fixes_6363
[fix] #6363
2016-10-24 11:56:43 +05:30
Nabin Hait
00b3443b61 Merge pull request #6653 from shreyasp/cust-credit-limit
[Minor] Do not allow change in credit limit
2016-10-24 11:55:24 +05:30
Nabin Hait
a221f7ec5d Update test_customer.py 2016-10-24 11:27:56 +05:30
Pawan Mehta
297e725727 Update project.json 2016-10-24 11:24:38 +05:30
Nabin Hait
df366a6e9c Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio
Warning if there are mutliple active salary structures
2016-10-24 11:23:57 +05:30
Mainul Islam
a964db7821 Add multiple emoloyee in salary structure (#6621)
* Add multiple emoloyee in salary structure

* Added in Menu

* Remove Default Value from Company field

* Change Section Label

* Added Button in Salary Structure and set route_options

* Remove Single Doctype

* Add Dialog for Employee Add

* View Employee and Check or Uncheck

* Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees

* Employees View Section in Dialog Added Employe Name and set Employee Id as Title

* Delete SIngle Doctype

* Chagne  to

* Remove checkbox

* Remove add button and set primary button
2016-10-24 11:22:00 +05:30
Nabin Hait
1db35ce79a Merge pull request #6651 from shreyasp/del-company-txn
Delete Communications while Deleting Company Transactions
2016-10-24 11:20:29 +05:30
Nabin Hait
6ef8ede280 Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip
include_holiday being taken into consideration while calculating lwp
2016-10-24 11:19:43 +05:30
Nabin Hait
5ced4dfe34 Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix
[Fix] leave application days should be less than max days leave allowed
2016-10-24 11:18:44 +05:30
pawan
03a77b1b65 [fix] 6363 2016-10-24 11:18:29 +05:30
pawan
46ead70be8 [fix] fixes_6363 2016-10-24 11:18:29 +05:30
pawan
9a43a2a97b [fix] #6363 2016-10-24 11:18:29 +05:30
pawan
28ad58905d [fix] #6363 2016-10-24 11:18:29 +05:30
pawan
8d187def12 [fix] #6363 2016-10-24 11:18:29 +05:30
Nabin Hait
8918dcf54e Merge pull request #6678 from KanchanChauhan/total-leave-days-updated
Total leave days gets updated on date change
2016-10-24 11:13:31 +05:30
Nabin Hait
988f850fe2 Merge pull request #6682 from KanchanChauhan/makebankentry-button-fix
[Fix] Make Bank Entry button depends_on fixed
2016-10-24 11:12:17 +05:30
Nabin Hait
0e75956f81 Merge pull request #6684 from KanchanChauhan/warehouse-based-on-company-MR
Warehouse based on selected Company
2016-10-24 11:09:42 +05:30
shreyas
f09929ea92 [Fix] Updated test cases to handle negative or zero outstanding amount against customer 2016-10-24 10:35:30 +05:30
shreyas
17f43da2a6 [Test] Added test cases to evaluate customer credit limit 2016-10-24 10:21:05 +05:30
shreyas
e05656963a [Minor] Do not allow change in credit limit 2016-10-24 10:21:04 +05:30
shreyas
c48eb45410 [Fix] Use company_fieldname as parameter to the query 2016-10-24 10:18:28 +05:30
shreyas
0f4cb55c3c [Fix] Delete communications before deleting the docs 2016-10-24 10:04:26 +05:30
shreyas
54d8590064 [Fix] Delete communications when user deletes company transactions 2016-10-24 10:04:26 +05:30
Kanchan Chauhan
55106ab66b Warehouse based on selected Company 2016-10-22 21:42:28 +05:30
Kanchan Chauhan
29ce0aab28 Warning if there are mutliple active salary structures 2016-10-22 20:48:44 +05:30
Kanchan Chauhan
c4c966691f [Fix] Make Bank Entry button depends_on fixed 2016-10-22 18:04:48 +05:30
Kanchan Chauhan
a084405bca Total leave days gets updated on date change 2016-10-22 11:55:51 +05:30
Kanchan Chauhan
a1006c0549 include_holiday being taken into consideration while calculating lwp 2016-10-21 17:53:15 +05:30
Kanchan Chauhan
24d580206a [Fix] leave application days should be less than max days leave allowed 2016-10-21 13:01:33 +05:30
Nabin Hait
44e9195378 Merge branch 'DigiThinkIT-develop' into develop 2016-10-20 17:01:44 +05:30
Nabin Hait
db88bd66b0 Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop 2016-10-20 16:59:40 +05:30
Nabin Hait
376449ff41 Merge pull request #6659 from shreyasp/selling-price-validation
[Minor] Validate purchase price against selling price
2016-10-20 16:46:35 +05:30
Nabin Hait
9f26bc16b7 Update selling_controller.py 2016-10-20 16:45:53 +05:30
Nabin Hait
05aa1712ff Merge branch 'rohitwaghchaure-stock_entry_total_amount_issue' into develop 2016-10-20 16:39:35 +05:30
Rohit Waghchaure
69be01aa1b [Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer 2016-10-20 16:38:30 +05:30
Nabin Hait
725b547641 Merge pull request #6657 from rohitwaghchaure/invoice_unlink_feature
[Feature] Provision to allow unlink the payment against the invoice
2016-10-20 16:36:57 +05:30
Rohit Waghchaure
18fa0d8691 patch to set default value as 1 2016-10-20 16:16:28 +05:30
Nabin Hait
938c858720 Merge pull request #6513 from KanchanChauhan/group-similar-item-in-po
Group similar items in PO
2016-10-20 16:11:24 +05:30