Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,727 Commits 3 Branches 0 Tags 1 GiB
3543f30046
Commit Graph

466 Commits

Author SHA1 Message Date
Anand Doshi
3543f30046 [calculations] [client/server] first cut 2013-05-24 19:25:01 +05:30
Anand Doshi
4543884021 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt
 2013-05-23 15:22:47 +05:30
Nabin Hait
62d0629d61 [feature] reorder level checking through scheduler 2013-05-22 16:19:10 +05:30
Nabin Hait
b7e07ac6a5 [fixes] updated no_copy field 2013-05-22 12:10:16 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Anand Doshi
48787e944e Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	patches/april_2013/p05_update_file_data.py
 2013-05-17 15:10:57 +05:30
Nabin Hait
1fd546f424 [fixes] prosting date for gl entry 2013-05-16 11:02:07 +05:30
Anand Doshi
aab81626ce Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	stock/doctype/item/item.txt
 2013-05-10 18:12:24 +05:30
Anand Doshi
21f4ea36b2 [selling] [calculations] server side calculations, test cases and rounding based on currency number format 2013-05-10 18:08:32 +05:30
Nabin Hait
f377402592 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-09 14:16:14 +05:30
Nabin Hait
5dc5bf9972 [stock entry] total amount field added 2013-05-09 14:15:24 +05:30
Anand Doshi
21b854b7cc [rename] [fix] merge related fixes 2013-05-09 13:21:13 +05:30
Anand Doshi
bddd5d9b0c [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Anand Doshi
4f8a81ca97 [item] [usability] change image view on change of image 2013-05-08 17:40:35 +05:30
Anand Doshi
75eeb01052 [attachments] [fix] on adding and removing attachments, update the select fields with options attach_files: 2013-05-08 12:35:33 +05:30
Anand Doshi
c414175a44 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-08 11:45:32 +05:30
Nabin Hait
04f888fa52 [fixes] item_code non-mandatory in item if naming_series 2013-05-07 16:03:10 +05:30
Nabin Hait
f2d4df975e [fixes] floating point issue in buying rate 2013-05-07 13:12:02 +05:30
Nabin Hait
c1b9619321 [fixes] company for auto-material request 2013-05-07 11:16:20 +05:30
Anand Doshi
3f9366bb6c Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	stock/doctype/item/item.txt
 2013-05-06 12:07:30 +05:30
Anand Doshi
0f5f584651 [stock entry] [test] fixes in test cases 2013-05-03 14:34:12 +05:30
Anand Doshi
9d504e4706 Merge branch 'price_list_country' 
Conflicts:
	home/page/latest_updates/latest_updates.js
	setup/doctype/price_list/price_list.txt
 2013-05-02 16:25:46 +05:30
Rushabh Mehta
f5f478ee78 [item] [naming] by series or code / [naming series] optionally set number of digits 2013-05-02 15:36:33 +05:30
Rushabh Mehta
88f6acdbe4 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-02 14:47:10 +05:30
Rushabh Mehta
3487e0a0f3 [price list] added currency property, validates currency, duplication in Item Price 2013-05-02 14:46:12 +05:30
Rushabh Mehta
c711598940 [doclist] new pattern / [item] pricelist must be unique / [formatter] show null floats as empty string 2013-05-02 14:22:40 +05:30
Nabin Hait
f2edbbd5cb [serial no][validation] status delivered -> in store, allowed for material receipt 2013-05-02 11:49:02 +05:30
Nabin Hait
02bc8bfe7e Merge branch 'master' of github.com:webnotes/erpnext 2013-05-02 11:39:43 +05:30
Rushabh Mehta
ecb36f2cb0 [purchase] [validation] validate warehouse belongs to company if set 2013-05-02 11:34:37 +05:30
Nabin Hait
81bbfba0cc [hr] allowed rename in earning and deduction type 2013-05-02 11:27:25 +05:30
Anand Doshi
447008b045 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	patches/april_2013/p05_update_file_data.py
 2013-05-01 14:48:16 +05:30
Anand Doshi
91e4c14470 [fixes] [__islocal] use doc.fields.get('__islocal') instead of doc.__islocal 2013-05-01 12:00:44 +05:30
Anand Doshi
d7ad13a8a7 [price list] [country] specify country for a price list 2013-04-29 19:38:34 +05:30
Nabin Hait
7ee7eae3ae [item][validation] some validation only after saving 2013-04-29 15:10:39 +05:30
Anand Doshi
c9897ff533 Merge branch 'edge' 
Conflicts:
	home/page/latest_updates/latest_updates.js
 2013-04-29 10:42:21 +05:30
Nabin Hait
04c1f94b4e [DN][usability] copy cost center in each row 2013-04-26 16:27:51 +05:30
Anand Doshi
d54a4741a9 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
 2013-04-24 12:02:54 +05:30
Anand Doshi
a5d19955d1 Merge branch 'master' of github.com:webnotes/erpnext into webshop 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
 2013-04-24 11:48:28 +05:30
Anand Doshi
a536eef393 Merge branch 'master' into edge 2013-04-23 13:10:55 +05:30
Nabin Hait
0a480f4efd fixes in item: organized code 2013-04-23 12:54:07 +05:30
Anand Doshi
dc0f2d2422 Merge branch 'master' into edge 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
 2013-04-23 12:42:18 +05:30
Nabin Hait
81c6a3beef stock uom mandatory for item 2013-04-23 11:39:54 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
90dad5c5b5 Merge branch 'master' into edge 2013-04-19 11:43:16 +05:30
Anand Doshi
90c9ae713c Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	stock/doctype/delivery_note_item/delivery_note_item.txt
 2013-04-17 18:04:08 +05:30
Anand Doshi
5717fe3aba [cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation 2013-04-17 18:02:52 +05:30
Nabin Hait
47ef15b04b removed errprint 2013-04-17 17:35:14 +05:30
Nabin Hait
bd7c8d89f2 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-17 17:22:23 +05:30
Nabin Hait
9a2dff6675 packing slip refactored 2013-04-17 17:21:31 +05:30
Anand Doshi
2b349d38d9 Merge branch 'master' into edge 2013-04-17 15:10:47 +05:30