Nabin Hait
223897f145
fixes merge conflict
2013-01-21 17:30:35 +05:30
Nabin Hait
d3b625035c
fixes in total_in_words
2013-01-21 17:24:31 +05:30
Rushabh Mehta
bb9968491b
added report permissions to txt files
2013-01-21 14:22:07 +05:30
Nabin Hait
30b142b563
removed unwanted import
2013-01-21 14:12:36 +05:30
Nabin Hait
1022198cc8
fixes in purchase price list
2013-01-18 16:47:39 +05:30
Nabin Hait
396f47d029
fixes in purchase price list
2013-01-18 16:29:30 +05:30
Anand Doshi
a81370f2a3
added description to Price List field. added in latest updates
2013-01-18 13:26:54 +05:30
Anand Doshi
8b940ee451
fixes after merge
2013-01-18 13:07:02 +05:30
Anand Doshi
ef02ddfc40
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
...
Conflicts:
accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Anand Doshi
8957bf9e09
print hide price list related fields
2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089
updates in purchase cycle's price list
2013-01-17 20:20:56 +05:30
Rushabh Mehta
db7139a649
started fresh install and added country_info
2013-01-17 18:22:22 +05:30
Anand Doshi
9d9aec1ed4
shifted get_company_currency from transaction base to setup/utils.py
2013-01-17 15:44:57 +05:30
Rushabh Mehta
6f9915cd17
install from txt files, part 1
2013-01-16 17:48:17 +05:30
Anand Doshi
756dca719b
refactored purchase cycle's get item details and update item details functions and started with purchase price list
2013-01-15 18:39:21 +05:30
Anand Doshi
4d79bfb225
added back Trend Analyzer report to home pages
2013-01-11 19:06:57 +05:30
Rushabh Mehta
ce1d5276ff
added moduleview
2013-01-09 16:39:27 +05:30
Rushabh Mehta
143ea718c3
commified item_code query
2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a
bootstrapped language and added 'hi'
2013-01-07 15:39:54 +05:30
Anand Doshi
62299260dc
shifted UOM field to after qty field in purchase cycle
2013-01-04 13:16:34 +05:30
Anand Doshi
f9a3c8fcdc
added status validation
2012-12-28 19:42:49 +05:30
Nabin Hait
5d273df92e
changes in layout of module home page
2012-12-28 15:39:21 +05:30
Anand Doshi
44c9def74f
if no address, only then have address type as Office
2012-12-27 18:34:35 +05:30
Rushabh Mehta
43eb513a43
Merge branch 'master' of github.com:webnotes/erpnext
2012-12-27 16:50:55 +05:30
Anand Doshi
b62c4edf02
added is_item_table_empty validation in submit event of purchase common
2012-12-27 15:35:58 +05:30
Rushabh Mehta
5f1d57ecb7
address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner
2012-12-27 14:05:02 +05:30
Anand Doshi
a0713196d2
Merge branch 'master' of github.com:webnotes/erpnext
2012-12-24 18:08:16 +05:30
Anand Doshi
f5d90abe92
addchild will never save added doc
2012-12-24 17:02:38 +05:30
Rushabh Mehta
6f65de15ae
appframe fixes
2012-12-22 13:50:35 +05:30
Anand Doshi
879ec66ea3
Merge branch 'production' of github.com:webnotes/erpnext into production
...
Conflicts:
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
buying/doctype/purchase_order_item/purchase_order_item.txt
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
patches/patch_list.py
2012-12-19 22:28:00 +05:30
Anand Doshi
f1854b1c2f
removed discount from print hide in purchase cycle
2012-12-19 12:01:48 +05:30
Nabin Hait
1a6a94b760
stock entry cleanup
2012-12-18 18:42:02 +05:30
Nabin Hait
f8de5b9878
merged with master
2012-12-14 10:43:56 +05:30
Rushabh Mehta
291449b6fb
refactored javascript models
2012-12-13 12:53:21 +05:30
Nabin Hait
be356b8692
Merge branch 'master' of github.com:webnotes/erpnext into production
2012-12-12 12:58:22 +05:30
Rushabh Mehta
74aebf0965
added Communication to Selling and refactored module pages a bit
2012-12-12 11:03:51 +05:30
Anand Doshi
c3b9a00c53
changed old type txt to new type txtt
2012-12-11 15:20:53 +05:30
Anand Doshi
c551964d5d
Merge branch 'master' into production
...
Conflicts:
patches/patch_list.py
production/doctype/bom_explosion_item/bom_explosion_item.txt
2012-12-11 14:59:19 +05:30
Anand Doshi
36bf910563
removed Standard from default print format
2012-12-11 14:01:59 +05:30
Anand Doshi
89e2dd8dbb
rename Production --> Manufacturing and delete old patches
2012-12-10 19:01:31 +05:30
Rushabh Mehta
af63b16be8
f
2012-12-10 13:41:10 +05:30
Anand Doshi
0952dcdda3
fixed error message in purchase common in update_refdoc_qty
2012-12-08 13:03:57 +05:30
Nabin Hait
2ce027fc9f
floating point issue in percentage delivered/billed
2012-12-07 14:43:06 +05:30
Nabin Hait
f71d8e0ee4
debit/credit adjustment if there is difference due to rounding
2012-12-06 17:24:59 +05:30
Anand Doshi
28bc87fb8c
fix in supplier creation issue due to missing make_autoname import
2012-12-06 14:55:36 +05:30
Rushabh Mehta
76c4f61ffb
more refactoring to renaming
2012-12-06 12:09:52 +05:30
Anand Doshi
737e9db4db
changed to cur_frm.call for get uom details
2012-12-05 18:26:28 +05:30
Anand Doshi
bfc6612979
Merge branch 'master' of github.com:webnotes/erpnext
2012-12-05 16:51:37 +05:30
Anand Doshi
0a32ed3219
allow changing the uom conversion factor in purchase cycle
2012-12-05 16:50:49 +05:30
Anand Doshi
69e9620609
fix in purchase order list
2012-12-05 13:04:14 +05:30
Nabin Hait
b24e783aef
deprecated tds
2012-12-04 18:58:15 +05:30
Nabin Hait
1d15c704af
rejected serial no fixes
2012-12-03 18:14:16 +05:30
Nabin Hait
23aac61bbf
removed basic info section
2012-12-03 17:27:21 +05:30
Anand Doshi
ec8709b009
Merge branch 'master' of github.com:webnotes/erpnext
2012-12-03 15:45:41 +05:30
Anand Doshi
ef6a76f8aa
fixes in renaming account, supplier, customer; fixes in accounts browser; fixes in customer address contact fetching in opportunity
2012-12-03 15:45:03 +05:30
Rushabh Mehta
e7fc747520
email_doc:bufix, autoselect in float, number fields
2012-12-03 15:23:11 +05:30
Rushabh Mehta
833f070991
added allow_rename and also fix in autonotification
2012-12-03 11:33:08 +05:30
Anand Doshi
9021ef75d1
minor fixes
2012-11-30 19:45:51 +05:30
Anand Doshi
eaed03d010
replaced convert_to_lists
2012-11-30 17:24:54 +05:30
Anand Doshi
ea61d8cf99
replaced set
2012-11-30 17:18:45 +05:30
Anand Doshi
535fbb1b00
replaced get_value
2012-11-30 17:16:03 +05:30
Anand Doshi
0fd99e7536
removed unnecessary imports
2012-11-30 16:38:04 +05:30
Rushabh Mehta
35c017a78f
cleanup of notification control: now in boot
2012-11-30 10:57:28 +05:30
Anand Doshi
88d522aa51
Merge branch 'master' of github.com:webnotes/erpnext
2012-11-28 17:14:23 +05:30
Anand Doshi
01bf10b8b6
changed default to Monthly in new grid reports
2012-11-28 17:12:18 +05:30
Nabin Hait
c62fe40e85
Merge branch 'master' of github.com:webnotes/erpnext
2012-11-28 16:49:53 +05:30
Nabin Hait
c4fb30dc8d
Removed basic info section
2012-11-28 16:49:18 +05:30
Rushabh Mehta
57774c032c
contact.js: set customer, supplier
2012-11-28 16:01:58 +05:30
Anand Doshi
ca868e42ae
added module icons in grid reports
2012-11-26 18:47:54 +05:30
Rushabh Mehta
78d4b49e62
introducing model 3.0, refactored import module
2012-11-23 17:53:43 +05:30
Anand Doshi
a546411873
set supplier get query if supplier field exists in purchase cycle
2012-11-23 10:48:47 +05:30
Anand Doshi
83350bc946
supplier can now be searched using name
2012-11-22 17:39:19 +05:30
Anand Doshi
293e0124cd
convert select to chosen, if specified in filters
2012-11-22 16:53:04 +05:30
Rushabh Mehta
fe7b444903
reportview, grid_report part of build and separate default dates
2012-11-12 15:39:47 +05:30
Anand Doshi
548eb7b1c3
change project get_query to include projects with status other than Completed and Cancelled
2012-10-29 14:26:38 +05:30
Nabin Hait
981d48339a
Warehouse merging feature and update_bin cleanup
2012-10-26 14:42:48 +05:30
Anand Doshi
1aace542c9
removed import error bypass and added missing py files for each doctype
2012-10-10 14:26:23 +05:30
Anand Doshi
cdba51c5a9
added page permissions, modified report listing links
2012-10-04 18:11:29 +05:30
Rushabh Mehta
e7ccc317de
dynamic loading for reports
2012-10-04 09:57:01 +05:30
Nabin Hait
9462ce9aef
Taxes and charges category issue fixed
2012-10-03 11:54:06 +05:30
Nabin Hait
111a086900
floating point issue fixed tax calculation
2012-10-02 18:30:07 +05:30
Anand Doshi
3245a15cb7
added future imports
2012-10-01 11:35:49 +05:30
Rushabh Mehta
7c454b3039
dont save duplicate files
2012-09-25 18:20:36 +05:30
Rushabh Mehta
0152b12e75
__session_cache removed and introducted memcache for caching
2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c
updated paths
2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d
moved directory structure
2012-09-24 19:13:42 +05:30
Rushabh Mehta
66ac2b018a
first cut for lazy loading framework
2011-09-05 18:43:09 +05:30
Nabin Hait
2c03015537
same from and to flds deleted from mapper
2011-08-25 19:41:24 +05:30
Nabin Hait
d075a6c53d
Removed cstr in return for get_server_fields()
2011-08-17 10:50:57 +05:30
Rushabh Mehta
89717292b7
fixed get_server_values to make them utf-8 friendly
2011-08-12 10:55:43 +05:30
Brahma K
790a78785b
fixed conflict
2011-07-27 10:54:11 +05:30
Brahma K
8a76466d7c
Lease Agreement
...
Used by leasing and loan agents, who needs to followup their receipts against lease agreements
Contains leasing related reports with prefix "Lease"
Upload Account Transactions
Added a file to upload account transactions from csv file, which passes Journal Voucher and submits automatically
2011-07-26 18:43:53 +05:30
Brahma K
5de4e4ae1a
PO Items to receive fixed
2011-07-25 14:53:03 +05:30
nabinhait
1458af0691
Index patch released and doctype updated based on index
2011-07-20 10:31:19 +05:30
nabinhait
e6526369f3
Accounts Payable report improved: some query written outside the for-loop
...
Supplier: supplier_status field has been deleted, not used by anyone except janak
index patch modified
2011-07-19 18:09:26 +05:30
Ravi Dey
6c174a6e35
company default currency fix
2011-07-11 16:40:49 +05:30
nabinhait
1bd56b1c08
removed get_tips() from js file
2011-07-05 14:41:36 +05:30
nabinhait
c297df5b16
Removed Tips Common from each js file
2011-07-05 10:54:05 +05:30
nabinhait
68c6e00b52
removed check_approving_authority fn and Approval Structure dt bcoz it was not using anywhere
2011-07-04 13:18:15 +05:30
nabinhait
a56fc00ea3
resoved conflict in patch, company and renaming tools
2011-07-01 16:32:03 +05:30
nabinhait
963f36b969
all txt files updated due to module renaming/merging
2011-07-01 15:47:42 +05:30
nabinhait
ec097975d0
restructured erpnext and deleted unwanted
2011-07-01 13:34:41 +05:30