Nabin Hait
|
fe5dcd49ae
|
Merge pull request #1183 from nabinhait/hotfix
[fix] [minor] update naming series
|
2013-12-14 03:50:02 -08:00 |
|
Nabin Hait
|
70cd146bb5
|
[fix] [minor] update naming series
|
2013-12-14 17:16:21 +05:30 |
|
Akhilesh Darjee
|
d9255abd46
|
[fix] [minor] set send_print_in_body_and_attachment in email settings
|
2013-12-06 18:49:48 +05:30 |
|
Anand Doshi
|
979a69f32a
|
[minor] [fix] outgoing email settings - Use TLS instead of Use SSL
|
2013-11-28 12:05:34 +05:30 |
|
Akhilesh Darjee
|
dc4821de08
|
[fix] [minor] backup dropbox fixed for backup and files path
|
2013-11-26 19:15:41 +05:30 |
|
Akhilesh Darjee
|
b0a1b3ab47
|
[fix] [minor] test cases fixes
|
2013-11-26 14:45:27 +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 |
|
Nabin Hait
|
4ccb2edbfd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-11-22 18:10:46 +05:30 |
|
Anand Doshi
|
ef114773a6
|
[minor] [website] brand_html
|
2013-11-22 13:25:58 +05:30 |
|
Rushabh Mehta
|
4f08235eeb
|
[email] [minor] changed label webnotes/erpnext#1082
|
2013-11-22 12:30:51 +05:30 |
|
Anand Doshi
|
6c29492652
|
[minor] [fix] first web page should set brand_html
|
2013-11-21 18:28:03 +05:30 |
|
Anand Doshi
|
0c8fd3408c
|
[minor] [website] fix in container
|
2013-11-21 14:58:59 +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 |
|
Anand Doshi
|
4b781d0117
|
[minor] website fixes
|
2013-11-19 15:54:28 +05:30 |
|
Rushabh Mehta
|
ebdddf3fb6
|
[website] [sitemap] cleanup
|
2013-11-19 14:20:52 +05:30 |
|
Anand Doshi
|
1d55be86b2
|
[minor] [fix] dropbox
|
2013-11-18 13:49:41 +05:30 |
|
Anand Doshi
|
89844f803d
|
[minor] check permission for editable web page
|
2013-11-13 17:34:21 +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
|
91db9dc4ee
|
[cleanup] [ui] minor
|
2013-11-11 18:28:45 +05:30 |
|
Rushabh Mehta
|
a063b4d50e
|
[cleanup] UI Fixes, minor
|
2013-11-06 11:29:47 +05:30 |
|
Anand Doshi
|
2ced381976
|
[minor] fixes in test cases and demo
|
2013-11-04 14:37:29 +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
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Akhilesh Darjee
|
0b39e95011
|
[cleanup] moved for territory, price list and item price doctype from setup to stock
|
2013-10-31 12:35:52 +05:30 |
|
Nabin Hait
|
dc89acaf05
|
[fix] [minor] fetch item and price list details on saving item price
|
2013-10-28 19:59:44 +05:30 |
|
Nabin Hait
|
ef42d60153
|
[fix] [minor] fetch item and price list details on saving item price
|
2013-10-26 15:06:09 +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 |
|
Nabin Hait
|
101a097e44
|
[fix] [minor] ignore permission on setting values in control panel
|
2013-10-24 15:33:55 +05:30 |
|
Akhilesh Darjee
|
b9bca26671
|
[fix] [minor] time zone fix
|
2013-10-24 12:52:23 +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
|
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 |
|
Akhilesh Darjee
|
b558ff68b9
|
[fix] added country and time zone to global defaults
|
2013-10-23 20:09:08 +05:30 |
|
Nabin Hait
|
4ed7f68344
|
[utility] repost stock
|
2013-10-23 11:50:09 +05:30 |
|
Nabin Hait
|
1abbebad7b
|
[fix] [minor] naming series patch
|
2013-10-21 16:29:10 +05:30 |
|
Akhilesh Darjee
|
41e4fb2bb8
|
[fix] [minor] item wise price list rate report currency fix
|
2013-10-21 16:14:02 +05:30 |
|
Rushabh Mehta
|
f3f496a8d7
|
[naming series] [minor] [fix]
|
2013-10-21 15:24:49 +05:30 |
|
Nabin Hait
|
953d0a955f
|
[feature] Replace Company Abbr
|
2013-10-21 12:53:10 +05:30 |
|
Bárbara Perretti
|
a137e8cf03
|
Fix translate setup/doctype/company/company.js
|
2013-10-18 14:25:29 -03:00 |
|
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
|
cd80d86dbb
|
[fix] [minor] renamed edit prices button from price list and item
|
2013-10-18 15:35:13 +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 |
|
Rushabh Mehta
|
46eaa55f06
|
[editable] [minor] made item, item_group pages editable
|
2013-10-18 12:17:20 +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 |
|