Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Anand Doshi
|
619ed5e949
|
[fix] [minor] [website]
|
2013-09-17 13:46:50 +05:30 |
|
Anand Doshi
|
ad0b05060a
|
Merge branch 'master' of github.com:webnotes/erpnext into website-wip
|
2013-09-17 11:00:24 +05:30 |
|
Akhilesh Darjee
|
2e1f94f222
|
[fix] [pos] hide custom buttons in pos view
|
2013-09-13 17:37:23 +05:30 |
|
Akhilesh Darjee
|
c96c13af4e
|
[fix] make demo for price list
|
2013-09-12 19:19:46 +05:30 |
|
Anand Doshi
|
3a6f4f882a
|
[fix] [minor] communication related cleanup
|
2013-09-12 19:10:05 +05:30 |
|
Anand Doshi
|
3b44ce5fb4
|
[website] [minor] fixes after moving website module
|
2013-09-12 16:59:12 +05:30 |
|
Anand Doshi
|
0748cb7d18
|
[website] [minor] moving to framework
|
2013-09-11 15:31:58 +05:30 |
|
Anand Doshi
|
b0d996ffb1
|
[website] [minor] moving to framework
|
2013-09-10 18:29:39 +05:30 |
|
Anand Doshi
|
330dae90cb
|
[website] [minor] moving to framework
|
2013-09-10 13:46:28 +05:30 |
|
Anand Doshi
|
429fd1d3d8
|
Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip
|
2013-09-10 12:54:10 +05:30 |
|
Anand Doshi
|
9686b937bb
|
[fix] [minor] print hide communication table
|
2013-09-10 10:54:34 +05:30 |
|
Rushabh Mehta
|
e865de01ee
|
[website] [minor] moving to framework
|
2013-09-09 12:32:35 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Anand Doshi
|
512113ae51
|
Merge branch 'customer-login'
|
2013-09-05 12:21:29 +05:30 |
|
Anand Doshi
|
7b044da0e3
|
[fix] [minor] on_communication, when checking if system user, extract email id and then check
|
2013-09-04 18:14:20 +05:30 |
|
Anand Doshi
|
53ecddd612
|
[fix] [communication] on communication send, update status
|
2013-09-04 17:52:27 +05:30 |
|
Anand Doshi
|
d01f0cb46e
|
[fix] [communication] on communication send, update status
|
2013-09-04 17:38:29 +05:30 |
|
Rushabh Mehta
|
090d410498
|
[minor] communication, webnotes/erpnext#790
|
2013-09-04 16:20:18 +05:30 |
|
Anand Doshi
|
0e23929740
|
Merge branch 'master' into customer-login
|
2013-09-03 16:42:21 +05:30 |
|
Nabin Hait
|
d2b87268c9
|
[fix] [minor] in fetching pos settings
|
2013-09-02 20:12:53 +05:30 |
|
Rushabh Mehta
|
96690ebd0f
|
[communication] [minor] cleaed model
|
2013-09-02 17:04:27 +05:30 |
|
Anand Doshi
|
9283b6c59d
|
[demo] [minor] fixes in make demo
|
2013-09-02 14:58:45 +05:30 |
|
Anand Doshi
|
ddb7c8048e
|
Merge branch 'master' of github.com:webnotes/erpnext into customer-login
|
2013-09-02 11:13:32 +05:30 |
|
Rushabh Mehta
|
e499a48f85
|
[demo] [minor]
|
2013-09-01 11:14:32 +05:30 |
|
Rushabh Mehta
|
0c2fb66051
|
[demo] [minor] [item] fix
|
2013-09-01 10:40:12 +05:30 |
|
Anand Doshi
|
c8e39b0965
|
[fix] [minor] use prop instead of attr to disable a field
|
2013-08-30 18:22:58 +05:30 |
|
Rushabh Mehta
|
010de37fcb
|
[website] [style] [minor] padding in blog categories
|
2013-08-29 22:28:58 +05:30 |
|
Rushabh Mehta
|
46ec268e9b
|
[communications] [minor] Code cleanup so it can be extended by custom script
|
2013-08-29 13:53:36 +05:30 |
|
Anand Doshi
|
85ef479db8
|
[demo] [minor] disable signup and don't allow editing profile
|
2013-08-27 23:21:19 +05:30 |
|
Anand Doshi
|
cb4c0ea1d5
|
[minor] [demo] form_dict
|
2013-08-27 15:39:31 +05:30 |
|
Anand Doshi
|
8d2e716697
|
[minor] [demo] form_dict
|
2013-08-27 15:26:12 +05:30 |
|
Anand Doshi
|
ee1044fde5
|
[minor] [demo] show banner on login
|
2013-08-27 14:49:04 +05:30 |
|
Anand Doshi
|
047f8d734b
|
[fix] [minor] get customer default only if customer has value
|
2013-08-27 14:20:00 +05:30 |
|
Anand Doshi
|
f668f97a6f
|
[minor] [demo]
|
2013-08-26 19:51:24 +05:30 |
|
Anand Doshi
|
c6601cb32d
|
[minor] [demo] do not allow creation of newsletter
|
2013-08-26 18:53:50 +05:30 |
|
Anand Doshi
|
c753d31ba7
|
[fix] [minor] erpnext demo
|
2013-08-26 17:33:50 +05:30 |
|
Anand Doshi
|
3c92b21876
|
[fix] [demo] extend sys path for make_erpnext_demo
|
2013-08-26 16:40:25 +05:30 |
|
Rushabh Mehta
|
acd3367e33
|
[demo] New ERPNext Demo
|
2013-08-26 16:17:50 +05:30 |
|
Rushabh Mehta
|
16a62fa4be
|
[pos] [cleanup]
|
2013-08-23 13:16:22 +05:30 |
|
Rushabh Mehta
|
622c98d6f4
|
[demo] [minor] Added accounts, moved JV creation to server-side
|
2013-08-22 15:17:58 +05:30 |
|
Rushabh Mehta
|
cce21d11fa
|
[major] upgrade to bootstrap 3
|
2013-08-21 17:48:08 +05:30 |
|
Rushabh Mehta
|
82e54c8293
|
[minor] fix to purchase receipt button, make_demo
|
2013-08-21 11:19:15 +05:30 |
|
Rushabh Mehta
|
20a109452a
|
[buying] [manufacturing] Added new Reports and fixes for demo
|
2013-08-20 15:18:42 +05:30 |
|
Rushabh Mehta
|
62030e05cc
|
[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master
|
2013-08-14 18:39:27 +05:30 |
|
Rushabh Mehta
|
ffe64db8f7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-14 10:41:19 +05:30 |
|
Rushabh Mehta
|
6ca903f62a
|
[minor] [demo] added commits
|
2013-08-13 14:31:15 +05:30 |
|
Anand Doshi
|
47e14a9de4
|
[fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings
|
2013-08-13 13:01:12 +05:30 |
|
Rushabh Mehta
|
4c17f9420e
|
[manufacturing] Added New Reports
|
2013-08-12 14:18:09 +05:30 |
|
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 |
|
Rushabh Mehta
|
0b9954059c
|
[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)
|
2013-08-09 15:30:11 +05:30 |
|
Anand Doshi
|
b6084f1e78
|
[fix] [minor] set customer defaults to fetch price list
|
2013-08-09 15:13:23 +05:30 |
|
Rushabh Mehta
|
75c3171c04
|
[rename] Naming Series is now Document Numbering Series and updated translations
|
2013-08-08 16:00:40 +05:30 |
|
Rushabh Mehta
|
2c968cecf5
|
[Production Order] [minor] Cleanup
|
2013-08-08 14:16:39 +05:30 |
|
Rushabh Mehta
|
7cfefbced5
|
[bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder
|
2013-08-07 17:46:35 +05:30 |
|
Rushabh Mehta
|
7c2a2e24a2
|
[demo] [minor] simulate quotation
|
2013-08-07 15:08:11 +05:30 |
|
Rushabh Mehta
|
0b50b48104
|
[salary structure] Cleanup, Fixed Monthly Register Report and other minor changes
|
2013-08-06 17:53:41 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Rushabh Mehta
|
7ee90ab4e6
|
[minor] [translation] Fixed German translations file webnotes/erpnext#509
|
2013-08-05 13:45:41 +05:30 |
|
Rushabh Mehta
|
2b76a5e82a
|
[minor] fixes to data import tool, docs and lead
|
2013-08-02 15:16:59 +05:30 |
|
Rushabh Mehta
|
cbf9cfe725
|
[fix] [minor] system manager role check
|
2013-07-31 09:52:28 +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
|
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 |
|
Nabin Hait
|
5e200e43a6
|
[minor] duplicate row id from same prevdoc
|
2013-07-29 15:29:51 +05:30 |
|
Anand Doshi
|
c7280b4973
|
[fix] [minor] fetch supplier default currency only if it exists
|
2013-07-29 11:48:28 +05:30 |
|
Anand Doshi
|
2b518e37e5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-26 11:34:38 +05:30 |
|
Anand Doshi
|
6c0b936f35
|
[minor] [fix] set customer and supplier defaults
|
2013-07-26 11:32:26 +05:30 |
|
Rushabh Mehta
|
c4f5e4fd3f
|
[docs] remove attributions from page and added to docs
|
2013-07-26 11:21:45 +05:30 |
|
Rushabh Mehta
|
152cecc9cd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-25 17:47:38 +05:30 |
|
Anand Doshi
|
f2045fb92e
|
[fix] [minor] set customer/supplier defaults
|
2013-07-25 17:46:02 +05:30 |
|
Rushabh Mehta
|
4dca40195e
|
[feature] Ability to set UOM as Integer-only and related validations.
|
2013-07-25 17:45:59 +05:30 |
|
Anand Doshi
|
85fa3d2bb9
|
[fix] [minor] upload callback arguments changed
|
2013-07-25 16:02:15 +05:30 |
|
Nabin Hait
|
8c0485d085
|
[fix] [minor] fix in sending sms from transactions
|
2013-07-24 16:56:03 +05:30 |
|
Nabin Hait
|
02a3d7ac12
|
[minor] [fix] fetching contact details
|
2013-07-24 16:33:30 +05:30 |
|
Anand Doshi
|
ba8ea7dbfd
|
[minor] [fix] fetch contact details
|
2013-07-24 12:08:42 +05:30 |
|
Nabin Hait
|
deff57826a
|
[minor] [fix] fetch contact details
|
2013-07-24 11:30:35 +05:30 |
|
Nabin Hait
|
a9ec49e0bf
|
[fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice
|
2013-07-15 16:33:24 +05:30 |
|
Nabin Hait
|
a279d78496
|
[minor] [fix]
|
2013-07-15 13:04:33 +05:30 |
|
Anand Doshi
|
9b4961400a
|
[minor] [fix] get queries
|
2013-07-11 19:13:58 +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
|
df92a553cb
|
[style] Added Icons to Pages
|
2013-07-11 14:50:43 +05:30 |
|
Anand Doshi
|
63d844b2d2
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.py
utilities/transaction_base.py
|
2013-07-10 20:55:15 +05:30 |
|
Anand Doshi
|
2ac0a83bd8
|
[webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order
|
2013-07-10 20:49:44 +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 |
|
Nabin Hait
|
253de859b4
|
[fixes] for testcases
|
2013-07-09 11:36:00 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Rushabh Mehta
|
11d688a536
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 15:14:15 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Anand Doshi
|
ef8d3bcb77
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 12:57:41 +05:30 |
|
Anand Doshi
|
901773a139
|
[fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files
|
2013-07-05 12:57:03 +05:30 |
|
Rushabh Mehta
|
54352c7140
|
[form cleanup]
|
2013-07-05 12:43:59 +05:30 |
|