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 |
|
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 |
|
Nabin Hait
|
6777efa7fa
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-04-28 17:09:13 +05:30 |
|
Nabin Hait
|
985918d42b
|
Minor fixes in company and account
|
2014-04-28 17:08:28 +05:30 |
|
Anand Doshi
|
69aa8ffac4
|
Fixed as_dict of employee.py
|
2014-04-28 16:51:34 +05:30 |
|
Nabin Hait
|
2594e41462
|
Removed Stock Ledger doctype
|
2014-04-28 16:23:45 +05:30 |
|
Nabin Hait
|
48962e1148
|
Minor fix in sales funnel report
|
2014-04-28 15:43:32 +05:30 |
|
Anand Doshi
|
65f83cbae7
|
BugFix: Sales Order with Order Type as Shopping Cart
|
2014-04-28 15:33:34 +05:30 |
|
Anand Doshi
|
3b3d55cda2
|
Usability: Set For Warehouse and Work-in-Progress Warehouse as mandatory, when the user clicks Submit
|
2014-04-28 15:33:34 +05:30 |
|
Anand Doshi
|
4c90bae16d
|
BugFix: Item search in Production Planning Tool
|
2014-04-28 15:33:34 +05:30 |
|
Anand Doshi
|
6916baa299
|
BugFix: Item search in Stock UOM Replace Utility
|
2014-04-28 15:33:34 +05:30 |
|
Néstor Díaz Valencia
|
21412ddf65
|
Update mode_of_payment.py
Renamed solves issue #1536
|
2014-04-28 11:54:31 +02:00 |
|
Rushabh Mehta
|
41d126586e
|
fix get_server_fields in stock_entry.js
|
2014-04-27 12:30:20 +05:30 |
|
Anand Doshi
|
8e5b2af0fb
|
Set conversion_factor in stock entry test case
|
2014-04-25 19:35:06 +05:30 |
|
Anand Doshi
|
fc79efb97c
|
Fixes #1532. Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt.
|
2014-04-25 18:44:28 +05:30 |
|
Anand Doshi
|
1872312cc6
|
Deprecated client side mapper: frappe.model.map. Fixes #1530
|
2014-04-25 18:38:08 +05:30 |
|
Anand Doshi
|
e3f6b6d899
|
Fixed Opportunity Lost UX
|
2014-04-25 18:36:06 +05:30 |
|
Anand Doshi
|
69a2c25ca5
|
Fixed set_query
|
2014-04-25 18:35:45 +05:30 |
|
Anand Doshi
|
bbffaf78fb
|
BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b
|
2014-04-25 18:31:09 +05:30 |
|
Anand Doshi
|
8bde7f9b3a
|
Conditionally toggle Naming Series. Fixes #1526
|
2014-04-24 18:11:49 +05:30 |
|
Anand Doshi
|
7f2d08b03f
|
Fixed Naming Series page loading fails #1524
|
2014-04-24 13:51:35 +05:30 |
|
Anand Doshi
|
8c62c40a3d
|
Fixed Make Sales Order from Quotation #1522
|
2014-04-24 12:40:19 +05:30 |
|
Anand Doshi
|
78eeacb53c
|
Fixes in Lead, Opportunity, Quotation, Setup Wizard
|
2014-04-23 19:15:15 +05:30 |
|
Anand Doshi
|
f50a65294f
|
Fixed NameError handling
|
2014-04-23 13:41:28 +05:30 |
|
Anand Doshi
|
b054eb7a4f
|
Call calculate_taxes_and_totals after mapping
|
2014-04-22 20:35:22 +05:30 |
|
Anand Doshi
|
4bb87373dc
|
Fixed default website creation
Default website generation was creating company page twice,
which led to duplicate website route validation
|
2014-04-22 19:50:08 +05:30 |
|
Anand Doshi
|
68d0b7c7ff
|
get_item_details fixed for Material Request
|
2014-04-22 19:30:53 +05:30 |
|
Anand Doshi
|
3e41fd1fd3
|
List route for tree browser based doctypes; Fixes to add child in tree browsers
|
2014-04-22 18:55:21 +05:30 |
|
Rushabh Mehta
|
4ef1835bee
|
website updates
|
2014-04-22 16:52:35 +05:30 |
|
Anand Doshi
|
2944f49974
|
Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML
|
2014-04-22 16:25:58 +05:30 |
|
Anand Doshi
|
07339fc69e
|
Fixes in Setup Wizard and Attachments
|
2014-04-22 15:30:24 +05:30 |
|
Rushabh Mehta
|
3f51705ba4
|
website cleanups
|
2014-04-21 22:10:43 +05:30 |
|
Anand Doshi
|
0549b1c5c9
|
Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year
|
2014-04-21 15:59:47 +05:30 |
|
Anand Doshi
|
21ae930b4c
|
Removed controller.py
|
2014-04-21 15:12:50 +05:30 |
|
Anand Doshi
|
424c033395
|
Removed controller.py
|
2014-04-21 15:06:56 +05:30 |
|
Rushabh Mehta
|
40b2b03bcb
|
demo fixes
|
2014-04-21 13:43:35 +05:30 |
|
Rushabh Mehta
|
f63513ed38
|
minor fixes to website
|
2014-04-21 13:43:35 +05:30 |
|
Anand Doshi
|
9365b616b8
|
Added an exist check for accounts.utils.get_balance_on
|
2014-04-21 12:42:21 +05:30 |
|
Anand Doshi
|
cbbf451974
|
Fixes throw
|
2014-04-21 11:33:49 +05:30 |
|
Anand Doshi
|
5d591ebe83
|
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
|
2014-04-18 16:20:07 +05:30 |
|
Rushabh Mehta
|
603e6e21b5
|
test fixes
|
2014-04-18 16:17:29 +05:30 |
|
Rushabh Mehta
|
370a024e46
|
cleaned up sample website and separated fixtures by country
|
2014-04-18 16:00:41 +05:30 |
|
Rushabh Mehta
|
169c1fd93b
|
fixed translation for setup-wizard and removed purchase validation for Material Request #925
|
2014-04-18 10:40:17 +05:30 |
|
Anand Doshi
|
ac32bad25a
|
Fixes in Taxes, Quotation and Address Territory
|
2014-04-18 01:32:02 +05:30 |
|
Rushabh Mehta
|
52e618d0b2
|
updates to Setup Wizard, set language as first input
|
2014-04-17 18:50:33 +05:30 |
|
Anand Doshi
|
dbfcd328fb
|
Fixes update_after_submit validation errors
|
2014-04-17 12:35:04 +05:30 |
|
Anand Doshi
|
0d345c9152
|
Fixes Item Price duplicate entry validation
|
2014-04-17 11:40:22 +05:30 |
|
Anand Doshi
|
de1a97d506
|
Fixes get_voucher_detail for Stock Reconcilation
|
2014-04-17 11:37:46 +05:30 |
|
Anand Doshi
|
094610d7ce
|
Fixes in Production, Stock Entry and Stock Controller
|
2014-04-16 20:23:24 +05:30 |
|
Rushabh Mehta
|
eea802298e
|
refactor get_voucher_details in stock_controller
|
2014-04-16 19:38:40 +05:30 |
|
Rushabh Mehta
|
052fe82688
|
production order: test fixed and added in test_stock_entry.py
|
2014-04-16 19:20:11 +05:30 |
|
Rushabh Mehta
|
166bc2a0e0
|
translations: updated German
|
2014-04-16 18:37:57 +05:30 |
|
Rushabh Mehta
|
c38fc713c6
|
updated translations
|
2014-04-16 17:46:30 +05:30 |
|