Nabin Hait
|
f2db87a766
|
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
|
2014-05-05 15:04:55 +05:30 |
|
Nabin Hait
|
53dab55703
|
Pricing Rule: if multiple rules, ask to resolve conflict #565
|
2014-05-05 14:49:40 +05:30 |
|
Nabin Hait
|
0c7e28ec9f
|
Pricing Rule improvements #565
|
2014-05-05 11:13:36 +05:30 |
|
Nabin Hait
|
ed8a845e83
|
POS Make Payment dialog box fix #1441
|
2014-05-05 11:01:32 +05:30 |
|
Nabin Hait
|
d5886f36af
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-05 10:28:20 +05:30 |
|
Nabin Hait
|
f57f0a661a
|
Stock Entry: pulling items from BOM fixed #1579
|
2014-05-05 10:27:53 +05:30 |
|
Anand Doshi
|
69e0cb5d6f
|
Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573
|
2014-05-04 19:37:45 +05:30 |
|
Anand Doshi
|
2af558598c
|
Fixed travis
|
2014-05-04 16:13:33 +05:30 |
|
Nabin Hait
|
6dad4e9e89
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-04 16:02:44 +05:30 |
|
Nabin Hait
|
a096b2004f
|
Financial analytics graph fix #1542
|
2014-05-04 16:02:26 +05:30 |
|
Anand Doshi
|
4ab5382d3f
|
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
|
2014-05-04 11:50:10 +05:30 |
|
Rushabh Mehta
|
24a3ec57e3
|
update to tests
|
2014-05-03 16:22:46 +05:30 |
|
Anand Doshi
|
75042fd502
|
Show Activity entries based on permissions. Completely fixes #1481
|
2014-05-02 19:44:28 +05:30 |
|
Anand Doshi
|
2b0e4266cf
|
Go to home page on clicking left arrow in note list
|
2014-05-02 19:43:11 +05:30 |
|
Anand Doshi
|
ef5407479a
|
Show Chart of Accounts in Accounts > Documents. Fixes #1559
|
2014-05-02 19:42:27 +05:30 |
|
Anand Doshi
|
56f29cbb27
|
Fixed contact page response. Fixes #1557
|
2014-05-02 18:17:39 +05:30 |
|
Nabin Hait
|
232954d4b9
|
Fixed updating cost on BOM after submission #1563
|
2014-05-02 17:51:24 +05:30 |
|
Nabin Hait
|
053a87edf6
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 17:37:38 +05:30 |
|
Nabin Hait
|
296d626e53
|
Back flush issue fixed in sub contracting #1567
|
2014-05-02 17:36:13 +05:30 |
|
Nabin Hait
|
bc83b9c1ac
|
minor fix
|
2014-05-02 17:03:18 +05:30 |
|
Anand Doshi
|
b71a18cd1e
|
Leave Allocation Tool and Employee. Fixes #1555
|
2014-05-02 16:23:51 +05:30 |
|
Nabin Hait
|
2cebf9b499
|
minor fix #1565
|
2014-05-02 16:12:07 +05:30 |
|
Nabin Hait
|
ef30932807
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 15:45:52 +05:30 |
|
Nabin Hait
|
6b03914731
|
asynchronus issue in get_party_details
|
2014-05-02 15:45:10 +05:30 |
|
Anand Doshi
|
f29bcaf436
|
Added new fixtures (Fixes #1540). Removed Employee Grade from HR.
|
2014-05-02 13:55:07 +05:30 |
|
Rushabh Mehta
|
4ceb20e07f
|
hooks.txt -> hooks.py
|
2014-05-02 12:15:11 +05:30 |
|
Nabin Hait
|
1e6c32e95f
|
Address and contact creation from opportunity #1570
|
2014-05-02 11:42:24 +05:30 |
|
Nabin Hait
|
92c4fc4e19
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 10:27:17 +05:30 |
|
Nabin Hait
|
d341254786
|
Purchase receipt to purchase invoice item
|
2014-05-01 17:42:21 +05:30 |
|
Anand Doshi
|
51e6d2228d
|
Salary Slip - read permission for Employee. Fixes #1553
|
2014-05-01 16:28:13 +05:30 |
|
Nabin Hait
|
292a254bc1
|
payment to invoice matching tool disabled temporarily
|
2014-05-01 15:46:37 +05:30 |
|
Nabin Hait
|
5b98340d15
|
payment to invoice matching
|
2014-05-01 15:43:22 +05:30 |
|
Nabin Hait
|
e5bd955f4d
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-01 09:56:14 +05:30 |
|
Anand Doshi
|
d9f0f27cd4
|
Fixes in test cases
|
2014-04-30 22:16:25 +05:30 |
|
Nabin Hait
|
dcfad4f645
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-30 20:32:07 +05:30 |
|
Nabin Hait
|
613919325d
|
Fixes in link field queries
|
2014-04-30 20:30:33 +05:30 |
|
Rushabh Mehta
|
a15164750d
|
started client side testing using selenium and other related and unrelated fixes
|
2014-04-30 19:39:13 +05:30 |
|
Nabin Hait
|
b85a9108eb
|
Payment to invoice matching tool
|
2014-04-30 19:32:16 +05:30 |
|
Nabin Hait
|
498ecfc192
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-30 19:31:22 +05:30 |
|
Nabin Hait
|
576f025c84
|
Payment to invoice matching tool
|
2014-04-30 19:30:50 +05:30 |
|
Anand Doshi
|
a47bf2ab66
|
Removed check for duplicate in sales bom, set default income account in Company
|
2014-04-30 18:54:05 +05:30 |
|
Anand Doshi
|
f62da519d6
|
Sales BOM Parent Item search - Fixes #1544
|
2014-04-30 16:50:39 +05:30 |
|
Anand Doshi
|
04f8990c11
|
Fixed can freeze account check for account doc in client side
|
2014-04-30 15:02:17 +05:30 |
|
Rushabh Mehta
|
33003c6168
|
fix for feature setup in install.py
|
2014-04-30 11:16:02 +05:30 |
|
Rushabh Mehta
|
104c9f465d
|
updated translations
|
2014-04-29 18:36:27 +05:30 |
|
Rushabh Mehta
|
d21f55b5d2
|
fix in naming and feature setup on install:
|
2014-04-29 16:25:07 +05:30 |
|
Nabin Hait
|
b54307d58e
|
minor fixes for pos trigger
|
2014-04-29 13:40:54 +05:30 |
|
Nabin Hait
|
b1777ecfd8
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-29 11:31:37 +05:30 |
|
Nabin Hait
|
17910aa0d6
|
Removed income and expense related info temporarily from email digest
|
2014-04-29 11:31:11 +05:30 |
|
Anand Doshi
|
cd17bdffcd
|
Fixes in account query, fiscal year and cost center
|
2014-04-28 20:34:48 +05:30 |
|