Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,582 Commits 3 Branches 0 Tags 1 GiB
bed14d7fa4
Commit Graph

594 Commits

Author SHA1 Message Date
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
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
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
Bárbara Perretti
c4e70c38b6 Fix translate Startup.js 2013-10-14 16:58:14 -03:00
Nabin Hait
570b1070a8 [fix] [minor] stock balance report for serialized item 2013-10-14 17:54:28 +05:30
Akhilesh Darjee
7837827e30 [fix] [minor] conversion arte related fixes 2013-10-11 19:06:30 +05:30
Akhilesh Darjee
1797cfef63 [fix] removed validation of conversion rate equals 1 from all transaction 2013-10-11 13:34:10 +05:30
Rushabh Mehta
f56d73c9bc [minor] removed get_rate 2013-10-10 17:07:53 +05:30
Bárbara Perretti
961d2e2104 Fix translate utils.js 2013-10-08 15:01:37 -03:00
Bárbara Perretti
534af0bcca Fix translate transaction.js 2013-10-08 15:00:07 -03:00
Bárbara Perretti
fa567a1190 Fix translate stock_analytics.js 2013-10-08 14:56:03 -03:00
Bárbara Perretti
e5b83d7995 Fix translate startup.js 2013-10-08 14:48:34 -03:00
Bárbara Perretti
2368004cb0 Fix translate sales_trends_filters.js 2013-10-08 14:41:46 -03:00
Bárbara Perretti
2dcfbd1642 Fix translate purchase_trends_filters.js 2013-10-08 14:35:14 -03:00
Rushabh Mehta
8c5a5f1ed5 New Setup Wizard 2013-10-08 17:59:11 +05:30
Bárbara Perretti
79c43988b4 Fix translate feature_setup.js 2013-10-07 18:56:56 -03:00
Bárbara Perretti
339129b21b Fix translate feature_setup.js 2013-10-07 17:54:05 -03:00
Bárbara Perretti
f99085055d Fix translate feature_setup.js 2013-10-07 17:32:29 -03:00
Bárbara Perretti
97408254a2 Fix translate conf.js 2013-10-07 17:29:58 -03:00
Bárbara Perretti
f48ae14594 Fix translate complete_setup.js 2013-10-07 17:27:37 -03:00
Bárbara Perretti
4de55b4f6e Fix translate account_tree_grid.js 2013-10-07 17:10:04 -03:00
Rushabh Mehta
8941841a9c [setup wizard] added more steps [minor] [wip] 2013-10-07 18:22:29 +05:30
Nabin Hait
a1d1c980bc [minor] fixes in stock balance report, bin uom and sle is_cancelled 2013-10-02 16:29:45 +05:30
Nabin Hait
164d39d12f Merge pull request #883 from akhileshdarjee/master 
[feature] pos view added in all sales & purchase cycle
 2013-09-27 00:05:15 -07:00
Akhilesh Darjee
10dce341c8 [pos] pos view fixed for all purchase & sales cycle 2013-09-25 11:09:33 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30