Akhilesh Darjee
|
806017c92a
|
Price List and Item Price : Validfor Buying and Selling as separate check box
|
2014-01-07 18:37:38 +05:30 |
|
Nabin Hait
|
6472bdace2
|
Fixes in general ledger report
|
2014-01-03 12:30:24 +05:30 |
|
Nabin Hait
|
c38527ef5f
|
Show general/stock ledger button links to new query reports
|
2013-12-23 17:07:57 +05:30 |
|
Rushabh Mehta
|
28b33dfdd7
|
[patch] startup.js styling
|
2013-12-04 11:16:38 +05:30 |
|
Nabin Hait
|
8eb0c61649
|
[minor] merge conflict fixed
|
2013-11-21 12:28:50 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Akhilesh Darjee
|
6ca0548231
|
[fix] [minor] stock related reports fixed for serialized item
|
2013-11-18 12:16:48 +05:30 |
|
Akhilesh Darjee
|
0b3a8477b0
|
[fix] [minor] stock related report fixed
|
2013-11-18 11:21:04 +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 |
|
Rushabh Mehta
|
27336de68b
|
[minor] added missing icon
|
2013-11-15 13:55:45 +05:30 |
|
Nabin Hait
|
e505fbea54
|
[fix] [minor] stock balance report for serialized item
|
2013-11-15 13:38:23 +05:30 |
|
Rushabh Mehta
|
e34090aa2f
|
[pos] [minor] button back on toolbar and css, fixes webnotes/erpnext#1052
|
2013-11-15 11:30:23 +05:30 |
|
Rushabh Mehta
|
3910aa351f
|
[fixes] [ui] [minor]
|
2013-11-14 15:59:46 +05:30 |
|
Rushabh Mehta
|
483473d302
|
[fixes] [ui] [minor]
|
2013-11-14 15:35:57 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Akhilesh Darjee
|
e1cf3453b4
|
[fix] [minor] conversion rate validation message update
|
2013-11-12 19:49:10 +05:30 |
|
Akhilesh Darjee
|
e0b32824ff
|
[fix] [minor] updated message for conversion rate
|
2013-11-12 19:27:16 +05:30 |
|
Rushabh Mehta
|
7d8b189c8f
|
[cleanup] UI Fixes
|
2013-11-08 16:27: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 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Rushabh Mehta
|
bed14d7fa4
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-10-31 15:16:05 +05:30 |
|
Nabin Hait
|
392596cb91
|
[fix] [minor] account group balance in grid report
|
2013-10-28 19:59:44 +05:30 |
|
Rushabh Mehta
|
069672e197
|
[minor] cleanup start
|
2013-10-28 18:21:07 +05:30 |
|
Nabin Hait
|
1fbc03bcfb
|
[fix] [minor] account group balance in grid report
|
2013-10-27 16:20:51 +05:30 |
|
Nabin Hait
|
05ff7cbd90
|
[fix] [minor] translation issue in startup
|
2013-10-24 14:50:03 +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 |
|
Bárbara Perretti
|
8833c52c02
|
Fix translate public/js/startup.js
|
2013-10-21 17:39:37 -02: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
|
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
|
096d363087
|
[fix] fixed merge conflict
|
2013-10-18 12:50:28 +05:30 |
|
Nabin Hait
|
8f72d9f679
|
Merge pull request #974 from akhileshdarjee/master
[fix] [minor] conversion rate related fixes
|
2013-10-17 00:56:00 -07:00 |
|
Akhilesh Darjee
|
04638a5f77
|
[fix] [minor] onload post render also check for supplier
|
2013-10-17 13:19:46 +05:30 |
|
Akhilesh Darjee
|
acf65a7225
|
[fix] [minor] conversion rate related fixes
|
2013-10-17 13:04:26 +05:30 |
|
Rushabh Mehta
|
be7e8556b0
|
Merge pull request #972 from akhileshdarjee/master
[fix] [minor] conversion rater
|
2013-10-16 23:03:41 -07:00 |
|
Akhilesh Darjee
|
3add576b1e
|
[fix] [minor] conversion rate fix
|
2013-10-17 11:32:44 +05:30 |
|
Akhilesh Darjee
|
564c621c3e
|
[fix] [minor] conversion rate fix
|
2013-10-17 11:31:11 +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
|
a012ffedd1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-16 11:48:39 +05:30 |
|
Bárbara Perretti
|
acc7061ca7
|
Fix translate public/js/controllers/stock_controller.js
|
2013-10-15 17:29:57 -03:00 |
|
Bárbara Perretti
|
a1a8907e78
|
Fix translate startup.js
|
2013-10-15 17:27:26 -03:00 |
|
Akhilesh Darjee
|
61b5c59e70
|
[fix] fixed conversion rate for mapping any documents
|
2013-10-15 20:24:34 +05:30 |
|
Nabin Hait
|
b6f37b8195
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 16:55:54 +05:30 |
|
Nabin Hait
|
b338b6ed24
|
[fix] [minor] validate converion rate
|
2013-10-15 16:55:24 +05:30 |
|
Akhilesh Darjee
|
dd6ebc1a4d
|
[cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting
|
2013-10-15 15:54:31 +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 |
|
Akhilesh Darjee
|
20659d1346
|
[docs] [minor] merge conflict fixed
|
2013-10-15 11:25:57 +05:30 |
|