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 |
|
Rohit Waghchaure
|
7917ff6936
|
Test cases
|
2016-10-20 16:11:22 +05:30 |
|
Rohit Waghchaure
|
8055bd39ba
|
[Feature] Provision to allow unlink the payment against the invoice
|
2016-10-20 16:11:22 +05:30 |
|
Nabin Hait
|
05245d6328
|
Merge pull request #6661 from KanchanChauhan/demo-fixed-processpayroll-ss
Demo fixed for Process Payroll and Salary Structure
|
2016-10-20 16:05:08 +05:30 |
|
Kanchan Chauhan
|
1c1e2e9cbe
|
Demo fixed for Process Payroll and Salary Structure
|
2016-10-20 16:04:09 +05:30 |
|
shreyas
|
e8aaa92816
|
[Minor] Some more fixes to the code
|
2016-10-20 15:57:45 +05:30 |
|
shreyas
|
edcba51c8b
|
[Fix] Added check to validate selling price against valuation rate
|
2016-10-20 15:57:45 +05:30 |
|
shreyas
|
1cfe2d7b45
|
[Minor] Validate purchase price against selling price
|
2016-10-20 15:57:45 +05:30 |
|
Nabin Hait
|
6fb7b162e8
|
Create tax template based on country
|
2016-10-20 15:56:07 +05:30 |
|
Rohit Waghchaure
|
d23835be84
|
[Feature] Countrywise sales tax template
|
2016-10-20 15:56:07 +05:30 |
|
Kanchan Chauhan
|
cce16b29b0
|
Group similar items in PO
|
2016-10-20 14:31:34 +05:30 |
|
Saurabh
|
bc0783b527
|
[fix] duplicate columns in monthly salary report #6623
|
2016-10-20 12:55:23 +05:30 |
|
Kanchan Chauhan
|
025fbd8f14
|
Customer group added to Gross Profit report
|
2016-10-20 12:54:06 +05:30 |
|
Nabin Hait
|
3126c88da2
|
Merge pull request #6658 from nabinhait/develop
Set prefered contact email in Employee
|
2016-10-20 12:40:03 +05:30 |
|
Nabin Hait
|
97fa119b37
|
Set prefered contact email in Employee
|
2016-10-19 18:26:01 +05:30 |
|
Nabin Hait
|
0702fa2fc6
|
Fixed version conflict
|
2016-10-19 16:49:36 +05:30 |
|
Nabin Hait
|
d5e52bc251
|
Merge branch 'hotfix'
|
2016-10-19 16:48:05 +05:30 |
|
Nabin Hait
|
13a07c2029
|
bumped to version 7.0.62
|
2016-10-19 17:18:04 +06:00 |
|
Nabin Hait
|
9ef4f0dc30
|
Merge pull request #6640 from rohitwaghchaure/item_projected_qty_issue
[Fix] total projected qty in item master
|
2016-10-19 16:45:28 +05:30 |
|
Rohit Waghchaure
|
aa8abfa5b3
|
Test cases added in sales order to check total projected qty
|
2016-10-19 15:26:10 +05:30 |
|
Rohit Waghchaure
|
ac9172f6df
|
[Fix] total projected qty
|
2016-10-19 15:06:30 +05:30 |
|
Nabin Hait
|
44b4e5eef3
|
Merge pull request #6648 from saurabh6790/hotfix
[fix] calculate variance only for submitted budgets
|
2016-10-19 15:05:11 +05:30 |
|
Nabin Hait
|
ff183eedb9
|
Fixes for testcases
|
2016-10-19 14:23:02 +05:30 |
|
Nabin Hait
|
184f6d42cc
|
Merge pull request #6647 from netchampfaris/hotfix
[hotfix] print format image size
|
2016-10-19 13:05:04 +05:30 |
|
Saurabh
|
afceac620c
|
[fix] calculate variance only for submitted budgets
|
2016-10-19 12:49:48 +05:30 |
|
Faris Ansari
|
2acbb11923
|
[fix] print format image size
|
2016-10-19 12:08:00 +05:30 |
|
Nabin Hait
|
2b03d8f696
|
Merge pull request #6641 from JayVora-SerpentCS/develop
Pythonic corrections
|
2016-10-19 10:47:01 +05:30 |
|
Nabin Hait
|
a7a3a497d5
|
Fixed version conflict
|
2016-10-18 18:35:42 +05:30 |
|
Nabin Hait
|
b33695138c
|
Merge branch 'hotfix'
|
2016-10-18 18:35:18 +05:30 |
|
Nabin Hait
|
8872842edf
|
bumped to version 7.0.61
|
2016-10-18 19:05:18 +06:00 |
|
Rushabh Mehta
|
7791ed845f
|
[hot] [fix] student_dashboard.py
|
2016-10-18 18:33:19 +05:30 |
|
Nabin Hait
|
a943ec8ff5
|
Merge pull request #6642 from neilLasrado/develop
Fixes to Schools Module
|
2016-10-18 18:16:29 +05:30 |
|
Neil Trini Lasrado
|
377da58378
|
Set Student Name in Program Enrollment
|
2016-10-18 18:11:52 +05:30 |
|