Nabin Hait
|
1d361cf26c
|
[minor] merge conflict
|
2013-12-14 17:36:22 +05:30 |
|
Nabin Hait
|
45a35ced33
|
[fix] [minor] match condition fixes for customer and supplier
|
2013-12-14 17:29:42 +05:30 |
|
Nabin Hait
|
5534b59d07
|
Merge pull request #1180 from nabinhait/hotfix
[fix] [minor] fixes in packed item
|
2013-12-12 22:11:22 -08:00 |
|
Nabin Hait
|
1251a93fc5
|
[fix] [minor] fixes in packed item
|
2013-12-13 11:40:16 +05:30 |
|
Akhilesh Darjee
|
7d4c2d62bf
|
[fix] [minor] allowed renaming for address and contact
|
2013-12-12 12:32:43 +05:30 |
|
Akhilesh Darjee
|
abefa3fd40
|
[fix] [minor] supplier & customer rename fix
|
2013-12-10 14:22:52 +05:30 |
|
Akhilesh Darjee
|
5d3da6c095
|
[fix] [minor] rename fix for customer and supplier
|
2013-12-10 11:18:08 +05:30 |
|
Nabin Hait
|
5ff03e460b
|
[fix] [minor] removed duplicate validation for sales bom
|
2013-12-02 15:28:55 +05:30 |
|
Rushabh Mehta
|
e8aaf4b92f
|
[minor] Lead bugfix webnotes/erpnext#1115
|
2013-11-29 11:03:33 +05:30 |
|
Akhilesh Darjee
|
dacdc8d855
|
[fix] [minor] set customer as default for quotation_to in quotation form
|
2013-11-27 17:58:44 +05:30 |
|
Anand Doshi
|
e229c2c667
|
[minor] [patch] p01_cleanup
|
2013-11-26 23:13:05 +05:30 |
|
Nabin Hait
|
131939a742
|
[fix] [minor] rename and merge for customer and supplier
|
2013-11-26 15:03:51 +05:30 |
|
Nabin Hait
|
8d38027a6e
|
[fix] [minor] hide communication table from print
|
2013-11-25 11:38:31 +05:30 |
|
Nabin Hait
|
8eb0c61649
|
[minor] merge conflict fixed
|
2013-11-21 12:28:50 +05:30 |
|
Nabin Hait
|
ca471f41a1
|
[fix] Rename and merge rewrite
|
2013-11-20 13:14:12 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Rushabh Mehta
|
ebdddf3fb6
|
[website] [sitemap] cleanup
|
2013-11-19 14:20:52 +05:30 |
|
Akhilesh Darjee
|
a2fbe5cfd2
|
[fix] [minor] added price list in supplier form and filtered customer and supplier for selling and buying respectively
|
2013-11-19 11:45:55 +05:30 |
|
Jev Bjorsell
|
157e635f3b
|
Fix spelling and pluralization.
|
2013-11-17 17:25:57 -08:00 |
|
Jev Bjorsell
|
2721ee3acd
|
Corrected spelling so that 'splitted' becomes 'split'
|
2013-11-17 17:17:57 -08:00 |
|
Anand Doshi
|
aa268f0fed
|
[minor] [oops] removed sales_common.py
|
2013-11-15 19:21:33 +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 |
|
Nabin Hait
|
7373a83043
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-11-14 18:50:23 +05:30 |
|
Nabin Hait
|
155232e04e
|
[fix] credit limit validation
|
2013-11-14 18:37:33 +05:30 |
|
Akhilesh Darjee
|
65e974096f
|
[fix] showing customer dashboard headline to users with account related roles
|
2013-11-14 14:50:43 +05:30 |
|
Anand Doshi
|
5f73a980b5
|
[minor] replace 'raise e' with 'raise' for correct tracebacks
|
2013-11-13 17:31:00 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Rushabh Mehta
|
a063b4d50e
|
[cleanup] UI Fixes, minor
|
2013-11-06 11:29:47 +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 |
|
Rushabh Mehta
|
f7b203de2d
|
[cleanup] UI Fixes
|
2013-11-03 20:37:49 +05:30 |
|
Rushabh Mehta
|
ef5845589d
|
[cleanup] [minor] finishing styles, labels, descriptions
|
2013-11-02 14:47:11 +05:30 |
|
Akhilesh Darjee
|
9c1488a7c0
|
[cleanup] [minor] for territory fixed to applicable territory
|
2013-10-31 19:56:31 +05:30 |
|
Nabin Hait
|
d43c6bfdfb
|
[fix] [merge conflict]
|
2013-10-24 11:57:02 +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 |
|
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
|
2d82f26976
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-18 15:28:15 +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
|
1b0664636a
|
[fix] [conflict]
|
2013-10-18 13:07:28 +05:30 |
|
Nabin Hait
|
ef00af32c1
|
[minor] deleted sales common py
|
2013-10-18 13:02:57 +05:30 |
|
Nabin Hait
|
89ad6f2dab
|
[fix] [conflict]
|
2013-10-18 12:55:59 +05:30 |
|
Nabin Hait
|
d1fd1e2d89
|
[Cleanup] Sales Common deprecated
|
2013-10-18 12:50:28 +05:30 |
|
Nabin Hait
|
096d363087
|
[fix] fixed merge conflict
|
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 |
|
Nabin Hait
|
f146e8b7f5
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-16 11:19:09 +05:30 |
|
Bárbara Perretti
|
7329d7f118
|
Fix translate selling/doctype/sales_bom/sales_bom.js
|
2013-10-15 17:54:25 -03:00 |
|
Bárbara Perretti
|
f941e7499f
|
Fix translate selling/doctype/lead/lead.js
|
2013-10-15 15:22:53 -03:00 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Nabin Hait
|
b338b6ed24
|
[fix] [minor] validate converion rate
|
2013-10-15 16:55:24 +05:30 |
|
Nabin Hait
|
1c62cbe1fc
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-15 12:53:46 +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 |
|