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 |
|
Bárbara Perretti
|
058e246be6
|
Fix translate supplier_type.js
|
2013-10-15 18:15:29 -03:00 |
|
Bárbara Perretti
|
119326826a
|
Fix translate setup/doctype/territory/territory.js
|
2013-10-15 18:14:50 -03:00 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Anand Doshi
|
97e9deb1ff
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-10 16:10:25 +05:30 |
|
Anand Doshi
|
b604eddbfd
|
[minor] [fixes] view in website and other fixes
|
2013-10-10 15:43:32 +05:30 |
|
Rushabh Mehta
|
69ad94a795
|
[minor] fixes to form layouts
|
2013-10-10 15:30:12 +05:30 |
|
Rushabh Mehta
|
8c5a5f1ed5
|
New Setup Wizard
|
2013-10-08 17:59:11 +05:30 |
|
Bárbara Perretti
|
cd0a40b20f
|
Fix translate sales_person.js
|
2013-10-04 17:41:33 -03:00 |
|
Bárbara Perretti
|
5cf2c00472
|
Fix translate sales_partner.js
|
2013-10-04 17:40:44 -03:00 |
|
Bárbara Perretti
|
cc58f86842
|
Fix translate item_group.js
|
2013-10-04 17:37:30 -03:00 |
|
Bárbara Perretti
|
bd16f133ce
|
Fix translate email_digest.js
|
2013-10-04 17:34:45 -03:00 |
|
Bárbara Perretti
|
6e2fc5c676
|
Fix translate customer_group.js
|
2013-10-04 17:31:15 -03:00 |
|
Bárbara Perretti
|
fdb1fd361d
|
Fix translate company.js
|
2013-10-04 17:23:24 -03:00 |
|
Rushabh Mehta
|
43247cedea
|
[issues] [minor] fixed multiple minor issues
|
2013-10-03 14:50:55 +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
|
c49986f092
|
[minor] [fix] price list table
|
2013-10-02 16:14:30 +05:30 |
|
Anand Doshi
|
6f817b58ea
|
[minor] [fix] item price grid
|
2013-10-02 15:16:22 +05:30 |
|
Anand Doshi
|
2ebbe95e04
|
[minor] [fix] item prices html table
|
2013-10-02 12:44:59 +05:30 |
|
Anand Doshi
|
b6177cbb5b
|
[minor] change filename to unicode after os.walk and os.listdir
|
2013-10-01 17:11:39 +05:30 |
|
Akhilesh Darjee
|
67a9ea6800
|
[price_list] [minor] move header of new grid to right if currency
|
2013-09-30 19:05:36 +05:30 |
|
Akhilesh Darjee
|
eb8753e8b6
|
[fix] [minor] new grid to hide delete button on new row & added description
|
2013-09-30 15:56:36 +05:30 |
|
Akhilesh Darjee
|
9cb2cdbce6
|
[price_list] [minor] fix of new grid
|
2013-09-30 15:43:00 +05:30 |
|
Akhilesh Darjee
|
7d36fc821b
|
[fix] [minor] new grid fix to hide other grid
|
2013-09-30 12:44:00 +05:30 |
|
Akhilesh Darjee
|
d086d724b6
|
[price_list] new grid finished with fixes
|
2013-09-30 11:37:44 +05:30 |
|
Akhilesh Darjee
|
ff15367a1d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-30 11:35:36 +05:30 |
|
Akhilesh Darjee
|
2ba61236c1
|
[price list] make new grid
|
2013-09-27 21:08:37 +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 |
|
Nabin Hait
|
a7687e9ab6
|
[fix] [minor] create default web page only for first company
|
2013-09-25 13:43:35 +05:30 |
|
Nabin Hait
|
69a3ee54f2
|
[fix] [minor] create default warehouse on saving of company if not exists
|
2013-09-25 13:00:22 +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
|
cfed8c44b4
|
conf migration
|
2013-09-21 15:16:47 +05:30 |
|
Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Anand Doshi
|
2840620070
|
[fix] [minor] [website]
|
2013-09-17 15:28:58 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Anand Doshi
|
619ed5e949
|
[fix] [minor] [website]
|
2013-09-17 13:46:50 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Nabin Hait
|
7a75e10a61
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 10:21:20 +05:30 |
|
Akhilesh Darjee
|
2e1f94f222
|
[fix] [pos] hide custom buttons in pos view
|
2013-09-13 17:37:23 +05:30 |
|
Anand Doshi
|
8a4b21ab8e
|
Merge branch 'master' of github.com:webnotes/erpnext into website-wip
|
2013-09-11 19:38:38 +05:30 |
|
Akhilesh Darjee
|
fb6d410e60
|
[fix] test cases fix for price list
|
2013-09-11 16:18:10 +05:30 |
|
Akhilesh Darjee
|
c3ec72c991
|
[fix] [minor] merge conflict fixed
|
2013-09-11 14:49:38 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Nabin Hait
|
6e6ba9de14
|
[minor] label changed in sms settings
|
2013-09-10 17:20:42 +05:30 |
|
Anand Doshi
|
429fd1d3d8
|
Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip
|
2013-09-10 12:54:10 +05:30 |
|
Rushabh Mehta
|
7c2312a74c
|
[website] [minor] moving to framework
|
2013-09-10 12:51:52 +05:30 |
|
Anand Doshi
|
9686b937bb
|
[fix] [minor] print hide communication table
|
2013-09-10 10:54:34 +05:30 |
|