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 |
|
Rushabh Mehta
|
915eda9c4a
|
[minor] Added allow_rename in Employee webnotes/erpnetx#962
|
2013-10-11 10:57:13 +05:30 |
|
Bárbara Perretti
|
187ea3334f
|
Fix translate cart.js
|
2013-10-09 14:53:44 -03:00 |
|
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 |
|
Nabin Hait
|
6ec4b0c52a
|
[fix] [minor] display product image in shopping cart
|
2013-09-26 15:45:44 +05:30 |
|
Anand Doshi
|
de8b6aadaf
|
[minor] fixes for import conf
|
2013-09-24 17:17:39 +05:30 |
|
Anand Doshi
|
619ed5e949
|
[fix] [minor] [website]
|
2013-09-17 13:46:50 +05:30 |
|
Anand Doshi
|
3966c4cc5b
|
[fix] [minor] [website]
|
2013-09-16 19:28:06 +05:30 |
|
Anand Doshi
|
1be5bb7e6a
|
[portal] [minor] show status for order and invoice
|
2013-09-12 15:25:47 +05:30 |
|
Anand Doshi
|
fb109aded0
|
[website] [minor] moving to framework
|
2013-09-11 18:58:20 +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 |
|
Rushabh Mehta
|
4c6120ae04
|
[website] [minor] moving to framework
|
2013-09-10 12:18:58 +05:30 |
|
Rushabh Mehta
|
bdb846f665
|
[website] [minor] moving to framework
|
2013-09-09 17:31:19 +05:30 |
|
Rushabh Mehta
|
e865de01ee
|
[website] [minor] moving to framework
|
2013-09-09 12:32:35 +05:30 |
|