Anand Doshi
|
7e9048570e
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 12:18:46 +05:30 |
|
Akhilesh Darjee
|
20659d1346
|
[docs] [minor] merge conflict fixed
|
2013-10-15 11:25:57 +05:30 |
|
Anand Doshi
|
3510764e7c
|
[minor] plugin architecture, first cut
|
2013-10-14 18:59:16 +05:30 |
|
Nabin Hait
|
1a60fd8906
|
[fix] [minor] fixes in reposting of ordered, indented and planned qty
|
2013-10-14 14:27:08 +05:30 |
|
Akhilesh Darjee
|
1c7e5725a3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-14 13:43:11 +05:30 |
|
Akhilesh Darjee
|
7837827e30
|
[fix] [minor] conversion arte related fixes
|
2013-10-11 19:06:30 +05:30 |
|
Nabin Hait
|
eea2b34f4b
|
[production] update planned and produced ty
|
2013-10-11 18:31:33 +05:30 |
|
Akhilesh Darjee
|
1797cfef63
|
[fix] removed validation of conversion rate equals 1 from all transaction
|
2013-10-11 13:34:10 +05:30 |
|
Anand Doshi
|
b604eddbfd
|
[minor] [fixes] view in website and other fixes
|
2013-10-10 15:43:32 +05:30 |
|
Anand Doshi
|
7798934989
|
[minor] fixed globals and patch for wsgi migration
|
2013-10-10 12:03:11 +05:30 |
|
Rushabh Mehta
|
5d45557729
|
[wsgi] [minor] fixed flags
|
2013-10-08 18:23:05 +05:30 |
|
Rushabh Mehta
|
8c5a5f1ed5
|
New Setup Wizard
|
2013-10-08 17:59:11 +05:30 |
|
Anand Doshi
|
de4f8e6929
|
[minor] [demo] fixed Lead.csv
|
2013-10-04 13:20:39 +05:30 |
|
Rushabh Mehta
|
9dda0fb63b
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-03 18:13:40 +05:30 |
|
Rushabh Mehta
|
800b3aa437
|
[crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order
|
2013-10-03 17:26:33 +05:30 |
|
Anand Doshi
|
fd3addab7e
|
[minor] [fix] [demo]
|
2013-10-03 13:19:51 +05:30 |
|
Anand Doshi
|
fa228e9c9b
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
accounts/doctype/sales_invoice/sales_invoice.txt
selling/doctype/lead/lead.txt
selling/doctype/opportunity/opportunity.txt
stock/doctype/warehouse/warehouse.py
|
2013-10-02 16:52:52 +05:30 |
|
Anand Doshi
|
8db093b4c6
|
[minor] update password
|
2013-09-27 14:08:55 +05:30 |
|
Nabin Hait
|
164d39d12f
|
Merge pull request #883 from akhileshdarjee/master
[feature] pos view added in all sales & purchase cycle
|
2013-09-27 00:05:15 -07:00 |
|
Anand Doshi
|
f879a9dc2e
|
[minor] wnf refactor, fixes in demo
|
2013-09-26 15:56:54 +05:30 |
|
Nabin Hait
|
1ec5109a1a
|
Reduce ordered qty in Purchase Receipt based on PO warehouse
|
2013-09-25 19:58:32 +05:30 |
|
Anand Doshi
|
5b004ff8a7
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/account/account.py
accounts/doctype/gl_entry/gl_entry.py
accounts/doctype/period_closing_voucher/period_closing_voucher.py
stock/doctype/delivery_note/delivery_note.py
stock/doctype/landed_cost_wizard/landed_cost_wizard.py
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/stock_ledger/stock_ledger.py
stock/doctype/warehouse/warehouse.py
stock/stock_ledger.py
|
2013-09-25 19:55:41 +05:30 |
|
Akhilesh Darjee
|
10dce341c8
|
[pos] pos view fixed for all purchase & sales cycle
|
2013-09-25 11:09:33 +05:30 |
|
Anand Doshi
|
de8b6aadaf
|
[minor] fixes for import conf
|
2013-09-24 17:17:39 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Pratik Vyas
|
0eb811a518
|
[minor] remove send_invite_email field from demo docs
|
2013-09-23 16:04:50 +05:30 |
|
Pratik Vyas
|
cfed8c44b4
|
conf migration
|
2013-09-21 15:16:47 +05:30 |
|
Anand Doshi
|
12144f339e
|
Merge branch 'website-wip'
|
2013-09-19 12:27:11 +05:30 |
|
Nabin Hait
|
ad6ce4ee11
|
[fix] [minor] ignore permission while deleting event through code
|
2013-09-19 11:02:24 +05:30 |
|
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 |
|