Anand Doshi
|
0c8fd3408c
|
[minor] [website] fix in container
|
2013-11-21 14:58:59 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Akhilesh Darjee
|
910c7160cb
|
[fix] [minor] fetch suppler default price list in purchase transactions
|
2013-11-19 12:51:14 +05:30 |
|
Anand Doshi
|
0c26f8116d
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/account/account.py
controllers/accounts_controller.py
patches/patch_list.py
selling/doctype/sales_common/sales_common.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-11-15 19:12:09 +05:30 |
|
Akhilesh Darjee
|
e0b32824ff
|
[fix] [minor] updated message for conversion rate
|
2013-11-12 19:27:16 +05:30 |
|
Anand Doshi
|
ca8019bd97
|
[minor] fixes after remark field removal
|
2013-11-11 14:06:05 +05:30 |
|
Anand Doshi
|
427935f2a6
|
[minor] [fix] demo timezone
|
2013-11-07 15:53:09 +05:30 |
|
Anand Doshi
|
8728f26442
|
Refactored plugin architecture to allow custom script reports
|
2013-11-06 14:19:09 +05:30 |
|
Anand Doshi
|
3bed5abc76
|
[minor] demo login fix
|
2013-11-05 20:05:52 +05:30 |
|
Anand Doshi
|
2ced381976
|
[minor] fixes in test cases and demo
|
2013-11-04 14:37:29 +05:30 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Anand Doshi
|
fec52b5a8f
|
[minor] fixed stock entry and demo
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Nabin Hait
|
3eb901f47d
|
[merge] merged with master
|
2013-10-24 11:21:11 +05:30 |
|
Nabin Hait
|
5048c98911
|
[utility] repost stock
|
2013-10-23 12:14:32 +05:30 |
|
Nabin Hait
|
c2caae53dd
|
[utility] repost stock
|
2013-10-23 12:02:08 +05:30 |
|
Nabin Hait
|
4ed7f68344
|
[utility] repost stock
|
2013-10-23 11:50:09 +05:30 |
|
Nabin Hait
|
d1fd1e2d89
|
[Cleanup] Sales Common deprecated
|
2013-10-18 12:50:28 +05:30 |
|
Bárbara Perretti
|
4b41e5f7f7
|
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
|
2013-10-16 15:09:18 -03:00 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
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 |
|
Bárbara Perretti
|
91d9ddd4f0
|
Fix translate demo-login.js
|
2013-10-08 15:45:58 -03:00 |
|
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 |
|