Rushabh Mehta
|
813b1cba65
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-09 18:12:15 +05:30 |
|
Rushabh Mehta
|
4a404e9299
|
[price list] Separated Default Price List for Selling and Buying and changed fieldnames
|
2013-08-09 18:11:35 +05:30 |
|
Nabin Hait
|
d9ef559f3b
|
[fix] [minor] fix in updating numbering series
|
2013-08-09 13:17:32 +05:30 |
|
Rushabh Mehta
|
0983cb75d5
|
[cleanup] [minor] removed default value 0.00
|
2013-08-07 15:06:51 +05:30 |
|
Nabin Hait
|
cc0e2d1740
|
[minor] merged with master
|
2013-08-06 16:19:18 +05:30 |
|
Nabin Hait
|
43eba26dcf
|
[perpetual accounting] make gl entries relevant for different transactions
|
2013-08-06 16:00:50 +05:30 |
|
Anand Doshi
|
7e76ca350c
|
[fix] default float precision = 3, changed description of float precision in global defaults [issue] webnotes/erpnext#712
|
2013-08-06 13:33:42 +05:30 |
|
Rushabh Mehta
|
a1d668a6e3
|
[nested set] [minor] Added validation to test loop in hierarchy
|
2013-08-05 18:14:39 +05:30 |
|
Rushabh Mehta
|
d056e1b453
|
[minor] added webnotes.get_list, fixed webnotes/erpnext#663
|
2013-08-05 16:21:04 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
e79d57ca19
|
[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285
|
2013-08-02 19:31:41 +05:30 |
|
Anand Doshi
|
5cd58dc387
|
[usability] [issue] webnotes/erpnext#606 - disable default currency after a transaction is created for a company
|
2013-08-01 18:58:35 +05:30 |
|
Anand Doshi
|
49154c790e
|
[fix] if no valid territory for price list, try adding the user's default territory
|
2013-08-01 15:43:33 +05:30 |
|
Rushabh Mehta
|
e3742322fb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-30 16:20:19 +05:30 |
|
Rushabh Mehta
|
ed186b719e
|
[demo] [minor] Started make_demo.py
|
2013-07-30 16:19:40 +05:30 |
|
Anand Doshi
|
a648f46d4e
|
[fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228
|
2013-07-30 14:43:29 +05:30 |
|
Anand Doshi
|
1fac2a98cf
|
[fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions
|
2013-07-29 19:30:39 +05:30 |
|
Anand Doshi
|
5f6022681b
|
[fix] [minor] email digest events fix
|
2013-07-28 09:15:11 +05:30 |
|
Anand Doshi
|
2b518e37e5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-26 11:34:38 +05:30 |
|
Anand Doshi
|
720a01a6f6
|
[selling] changed fieldtype of Price List to link
|
2013-07-26 11:32:02 +05:30 |
|
Rushabh Mehta
|
dea6e51929
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-26 11:22:09 +05:30 |
|
Rushabh Mehta
|
c4f5e4fd3f
|
[docs] remove attributions from page and added to docs
|
2013-07-26 11:21:45 +05:30 |
|
Anand Doshi
|
23de6df72e
|
[fix] [minor] replace single quote in territory name while creating territories in setup control
|
2013-07-25 19:30:13 +05:30 |
|
Rushabh Mehta
|
4dca40195e
|
[feature] Ability to set UOM as Integer-only and related validations.
|
2013-07-25 17:45:59 +05:30 |
|
Rushabh Mehta
|
8f81a6f6c6
|
[feature] [setup] Added Refresh
|
2013-07-25 15:01:44 +05:30 |
|
Nabin Hait
|
48a0bd3eda
|
[minor] [fix] price list currency read only and SO-MR mapping
|
2013-07-23 15:31:39 +05:30 |
|
Anand Doshi
|
648a5c7e33
|
[fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse
|
2013-07-23 12:07:55 +05:30 |
|
Anand Doshi
|
832dd5f27d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-22 16:36:38 +05:30 |
|
Rushabh Mehta
|
500ce2bd6d
|
[minor] [fix] #218 add default home icon in website if brand not set so it appears okay for small layouts
|
2013-07-22 16:30:40 +05:30 |
|
Anand Doshi
|
fbd47e3da5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-22 16:26:44 +05:30 |
|
Anand Doshi
|
420828a416
|
[minor] [fix] parent item group query
|
2013-07-22 15:57:56 +05:30 |
|
Rushabh Mehta
|
c9bcfd1070
|
[cleanup] [minor] removed 'System Manager' permission for new setups
|
2013-07-22 15:33:10 +05:30 |
|
Anand Doshi
|
a45d164140
|
[currency exchange] set the default Currency as To Currency for a new record
|
2013-07-18 13:31:07 +05:30 |
|
Nabin Hait
|
67e6c80437
|
[fix] [minor] validate same sales rate patch
|
2013-07-18 13:25:47 +05:30 |
|
Nabin Hait
|
5b43b3dca5
|
merged with slow branch
|
2013-07-18 12:28:09 +05:30 |
|
Nabin Hait
|
6a3b951352
|
[accounts] [feature] optional checkbox for same rate validation in sales cycle
|
2013-07-16 18:34:35 +05:30 |
|
Anand Doshi
|
d618b6e1ab
|
[minor] [fix] email digest creation post setup
|
2013-07-16 17:12:48 +05:30 |
|
Anand Doshi
|
cefccb921e
|
[minor] [webshop] [fix]
|
2013-07-15 18:28:14 +05:30 |
|
Anand Doshi
|
1ffc5b576c
|
[minor] [for territory] auto add default For Territory in a new Tax Master, Shipping Rule and Price List
|
2013-07-15 18:09:43 +05:30 |
|
Anand Doshi
|
34736c8d87
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
|
2013-07-11 18:29:32 +05:30 |
|
Anand Doshi
|
946e0de0cf
|
[minor] [fix]
|
2013-07-11 18:26:00 +05:30 |
|
Nabin Hait
|
cfecd2bc16
|
[fix] [cleanup] fixes while testing and code cleanup
|
2013-07-11 17:49:18 +05:30 |
|
Rushabh Mehta
|
e464105c8e
|
[style] Style Fixes for Home Page
|
2013-07-11 15:28:05 +05:30 |
|
Rushabh Mehta
|
80d83f5ae3
|
[style] Style Fixes for Home Page
|
2013-07-11 15:19:13 +05:30 |
|
Rushabh Mehta
|
df92a553cb
|
[style] Added Icons to Pages
|
2013-07-11 14:50:43 +05:30 |
|
Rushabh Mehta
|
7571ff36b4
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-10 20:43:15 +05:30 |
|
Rushabh Mehta
|
e41bceb3df
|
[feature] [website] Create Default Home Page
|
2013-07-10 20:42:44 +05:30 |
|
Nabin Hait
|
d96bfaf6af
|
[fix] get_query where options not mentioned
|
2013-07-10 20:30:00 +05:30 |
|
Nabin Hait
|
eddd4a1674
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-10 19:12:14 +05:30 |
|
Nabin Hait
|
a4f0240bfc
|
[conflict] merged for get_query
|
2013-07-10 19:05:57 +05:30 |
|
Rushabh Mehta
|
ad71473f35
|
[cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix
|
2013-07-10 18:59:55 +05:30 |
|
Rushabh Mehta
|
982ad35fd2
|
[cleanup] Removed Warehouse Type
|
2013-07-10 18:39:06 +05:30 |
|
Nabin Hait
|
6e68e0e5d8
|
[fix] validate with prev doc
|
2013-07-10 15:33:29 +05:30 |
|
Rushabh Mehta
|
3429b609a7
|
[feature] [grid] Allow Grid viewable columns to be selected via 'In List View'
|
2013-07-10 15:03:37 +05:30 |
|
Rushabh Mehta
|
919b9fcccf
|
[cleanup] Maintenance Schedule, Maintenance Visit
|
2013-07-10 13:06:14 +05:30 |
|
Saurabh
|
2e3c06e66d
|
[get_query]to server side
|
2013-07-09 18:20:49 +05:30 |
|
Saurabh
|
38683718e1
|
[get_query] to server side
|
2013-07-09 16:34:50 +05:30 |
|
Saurabh
|
ab462d2000
|
[get_query]to server side
|
2013-07-09 16:18:52 +05:30 |
|
Anand Doshi
|
1357c0b2df
|
[cleanup] #402 changed fieldname company_name to company in Cost Center
|
2013-07-09 15:45:38 +05:30 |
|
Rushabh Mehta
|
44c1447b60
|
[setup] added icons, links, fixed single
|
2013-07-09 10:42:10 +05:30 |
|
Rushabh Mehta
|
56b66e22ab
|
[email] force use of loginid as the sender
|
2013-07-09 10:29:01 +05:30 |
|
Anand Doshi
|
3c6d440f09
|
[bean] [mandatory] fixes in test cases
|
2013-07-08 19:47:37 +05:30 |
|
Anand Doshi
|
615701d3ae
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
stock/doctype/material_request/material_request.txt
|
2013-07-08 18:54:00 +05:30 |
|
Anand Doshi
|
4ee647e84c
|
[bean] [mandatory] fixes in test cases
|
2013-07-08 18:50:45 +05:30 |
|
Rushabh Mehta
|
d9e7070f2d
|
[mapper-pull] for sales / purchae
|
2013-07-08 18:01:46 +05:30 |
|
Rushabh Mehta
|
1439854b27
|
[icons] added icons to forms, toolbars, moduleview, doclistview, reportview
|
2013-07-05 16:28:00 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Nabin Hait
|
44935e4608
|
[fixed conflict]
|
2013-07-05 10:26:29 +05:30 |
|
Anand Doshi
|
f4d8d23241
|
[setup] [fix] creation of fiscal year if start date is 1st Jan
|
2013-07-04 18:29:55 +05:30 |
|
Anand Doshi
|
99100a4135
|
[webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation
|
2013-07-04 17:13:53 +05:30 |
|
Nabin Hait
|
71c3f95098
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 18:28:26 +05:30 |
|
Rushabh Mehta
|
d420401ba3
|
[moduleview] added top bar
|
2013-07-01 17:15:23 +05:30 |
|
Nabin Hait
|
fdbfe1c274
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 12:20:19 +05:30 |
|
Rushabh Mehta
|
1bcc19e019
|
[item] default warehouse is selected with item
|
2013-07-01 11:46:07 +05:30 |
|
Rushabh Mehta
|
b3f947aca6
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-01 09:36:39 +05:30 |
|
Rushabh Mehta
|
8706ca9445
|
[journal voucher] [added opening entry] [cleanups]
|
2013-07-01 09:36:03 +05:30 |
|
Anand Doshi
|
971f30a12b
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-28 19:19:04 +05:30 |
|
Anand Doshi
|
8f9f8a43c7
|
[lead] [address] store lead address in Address doctype, with link field=lead
|
2013-06-28 19:18:33 +05:30 |
|
Nabin Hait
|
869913c96b
|
[fixes] setup control
|
2013-06-28 15:00:24 +05:30 |
|
Rushabh Mehta
|
03e9a4ea11
|
[company] [setup] added on_doctype_update to add indexes, renamed make_obj to make_controller
|
2013-06-28 12:49:28 +05:30 |
|
Rushabh Mehta
|
e6d986adea
|
[import] fixes
|
2013-06-27 10:54:49 +05:30 |
|
Rushabh Mehta
|
dd548eeac3
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-27 09:50:04 +05:30 |
|
Rushabh Mehta
|
65d12926fd
|
[setup] bug fixes
|
2013-06-26 22:31:22 +05:30 |
|
Anand Doshi
|
f7c4d1e807
|
[setup home] moved SMS Settings link to Tools section
|
2013-06-26 17:33:59 +05:30 |
|
Rushabh Mehta
|
5381bdd730
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 17:21:03 +05:30 |
|
Rushabh Mehta
|
2f7e1abd0f
|
[setup] new page + minor fixes
|
2013-06-26 17:20:12 +05:30 |
|
Anand Doshi
|
8bef70cceb
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 13:53:17 +05:30 |
|
Anand Doshi
|
bd7218979e
|
[shipping rule] added doctypes shipping rule and shipping rule conditions
|
2013-06-26 13:53:01 +05:30 |
|
Rushabh Mehta
|
f49f82083f
|
[chart of accounts] added from openerp (remove empty children)
|
2013-06-26 10:10:05 +05:30 |
|
Rushabh Mehta
|
db038fcb5c
|
[chart of accounts] added from openerp
|
2013-06-26 02:14:40 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Rushabh Mehta
|
7a93d5de30
|
[bug fixes] [global defaults] [cleanup]
|
2013-06-24 18:18:46 +05:30 |
|
Rushabh Mehta
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Rushabh Mehta
|
847cfe2b07
|
[docs] [setup] cleanup
|
2013-06-24 15:43:18 +05:30 |
|
Anand Doshi
|
7edb191661
|
[complete setup] [usability] refresh after success
|
2013-06-24 12:11:15 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Anand Doshi
|
c2a352711f
|
[shopping cart] show items, editable qty and show amount for that item
|
2013-06-19 17:19:20 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +05:30 |
|
Anand Doshi
|
3c5b1a5460
|
[partner listing] clear partners page on save
|
2013-06-13 15:38:16 +05:30 |
|