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 |
|
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 |
|
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 |
|