Nabin Hait
|
462401c4df
|
[minor] fixed conflict
|
2013-12-04 17:26:22 +05:30 |
|
Nabin Hait
|
9b0a6d426c
|
[patch] [minor] deleted old stock ledger and stock ageing page
|
2013-12-04 17:18:05 +05:30 |
|
Nabin Hait
|
bc6df5c71b
|
[patch] [minor] deleted old stock ledger and stock ageing page
|
2013-12-04 16:42:23 +05:30 |
|
Akhilesh Darjee
|
7e37b00d0a
|
[fix] [minor] merge conflict fixed
|
2013-12-02 18:02:45 +05:30 |
|
Akhilesh Darjee
|
9c0569ee2d
|
[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date
|
2013-12-02 17:58:23 +05:30 |
|
Anand Doshi
|
56a3165ac8
|
[minor] stock ledger report as script report
Issue #1121
|
2013-12-02 12:49:02 +05:30 |
|
Anand Doshi
|
39896233fa
|
[minor] patch list
|
2013-11-29 16:41:09 +05:30 |
|
Anand Doshi
|
cfd33d2a1d
|
[docs] removed from repository
|
2013-11-27 19:01:31 +05:30 |
|
Akhilesh Darjee
|
259208187c
|
[fix] [minor] patch for fixing report columns in defaults
|
2013-11-26 16:35:50 +05:30 |
|
Akhilesh Darjee
|
60ae96d588
|
[fix] [minor] merge conflict fixed
|
2013-11-26 11:21:07 +05:30 |
|
Akhilesh Darjee
|
ec0da0b177
|
[fix] [setup_wizard] fiscal year fix for setup wizard
|
2013-11-25 19:51:18 +05:30 |
|
Anand Doshi
|
ef114773a6
|
[minor] [website] brand_html
|
2013-11-22 13:25:58 +05:30 |
|
Rushabh Mehta
|
ef80282388
|
[minor] fix whitespace in patch_list
|
2013-11-22 13:14:12 +05:30 |
|
Rushabh Mehta
|
bc7358a12e
|
[comment] [minor] added patch to update
|
2013-11-22 12:22:41 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Anand Doshi
|
c3c38d38f0
|
[minor] [fix] style settings
|
2013-11-20 12:09:21 +05:30 |
|
Anand Doshi
|
aa14f03f5c
|
[minor] [fix] website sitemap reload
|
2013-11-20 11:51:42 +05:30 |
|
Rushabh Mehta
|
4e67b109f3
|
[website sitemap] [minor] fix and added patch
|
2013-11-19 16:39:54 +05:30 |
|
Anand Doshi
|
2b71380f1f
|
[minor] [patch] update reqd fields in reports
|
2013-11-16 12:33:34 +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 |
|
Rushabh Mehta
|
154c8579d6
|
[index] [minor] add indexes
|
2013-11-15 16:09:45 +05:30 |
|
Nabin Hait
|
9e5da835ec
|
[patch] make gl entries for submitted sales invoice where no gl entries exists
|
2013-11-14 18:41:09 +05:30 |
|
Anand Doshi
|
ec491dcc57
|
[minor] [patch]
|
2013-11-13 17:34:21 +05:30 |
|
Anand Doshi
|
778056ca5f
|
[minor] [patch] save style settings
|
2013-11-13 17:34:21 +05:30 |
|
Rushabh Mehta
|
3b9e864dec
|
[ui cleanup] [minor]
|
2013-11-11 18:01:37 +05:30 |
|
Anand Doshi
|
8728f26442
|
Refactored plugin architecture to allow custom script reports
|
2013-11-06 14:19:09 +05:30 |
|
Anand Doshi
|
b03f870441
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-04 15:22:50 +05:30 |
|
Anand Doshi
|
3673a25176
|
[minor] fixes after item price move
|
2013-11-04 15:14:57 +05:30 |
|
Anand Doshi
|
daaa14c079
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
setup/doctype/setup_control/setup_control.py
stock/doctype/stock_entry/stock_entry.py
utilities/demo/demo_docs/Price_List.csv
|
2013-11-04 13:14:39 +05:30 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Pratik Vyas
|
297041ed3e
|
Merge remote-tracking branch 'upstream/wsgi' into HEAD
Conflicts:
public/js/complete_setup.js
setup/doctype/setup_control/setup_control.py
|
2013-10-25 14:07:48 +05:30 |
|
Akhilesh Darjee
|
3d0af67799
|
[fix] [minor] add time zone and country to global defaults
|
2013-10-24 12:37:43 +05:30 |
|
Nabin Hait
|
3eb901f47d
|
[merge] merged with master
|
2013-10-24 11:21:11 +05:30 |
|
Nabin Hait
|
145e5e26fa
|
[patch] delete gl entries for cancelled vouchers
|
2013-10-22 23:51:41 +05:30 |
|
Nabin Hait
|
1500c83cce
|
-am
|
2013-10-22 11:42:50 +05:30 |
|
Nabin Hait
|
6a589be1c5
|
[patch] remove sales and purchase return tool
|
2013-10-22 10:54:59 +05:30 |
|
Rushabh Mehta
|
70d7c481e9
|
[naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854
|
2013-10-18 17:27:45 +05:30 |
|
Akhilesh Darjee
|
4ceef34c74
|
[report] created new item-wise price list rate report
|
2013-10-18 15:24:53 +05:30 |
|
Akhilesh Darjee
|
fcd70d04f3
|
[item price] item price made as an individual master and removed from price list
|
2013-10-18 14:24:21 +05:30 |
|
Nabin Hait
|
d1fd1e2d89
|
[Cleanup] Sales Common deprecated
|
2013-10-18 12:50:28 +05:30 |
|
Nabin Hait
|
1c62cbe1fc
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-15 12:53:46 +05:30 |
|
Nabin Hait
|
f0feb73ded
|
[minor] bypass plugin field related operational error
|
2013-10-15 12:22:41 +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 |
|
Anand Doshi
|
6bc48070a1
|
Moved Custom Server Scripts to custom_scripts/doctype_name.py
|
2013-10-14 15:48:57 +05:30 |
|
Nabin Hait
|
eea2b34f4b
|
[production] update planned and produced ty
|
2013-10-11 18:31:33 +05:30 |
|
Nabin Hait
|
0948b2a9d3
|
[fix] [minor] repost order qty patch
|
2013-10-10 19:04:18 +05:30 |
|
Anand Doshi
|
7798934989
|
[minor] fixed globals and patch for wsgi migration
|
2013-10-10 12:03:11 +05:30 |
|
Rushabh Mehta
|
8c5a5f1ed5
|
New Setup Wizard
|
2013-10-08 17:59:11 +05:30 |
|
Rushabh Mehta
|
800b3aa437
|
[crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order
|
2013-10-03 17:26:33 +05:30 |
|
Rushabh Mehta
|
f1b6f67a98
|
[Delivery Note] Moved prevdoc to Sales Order and Sales Invoice so links will work webnotes/erpnext#868
|
2013-10-03 12:22:52 +05:30 |
|