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

606 Commits

Author SHA1 Message Date
Rushabh Mehta
0ab1bdf94e [cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options 2013-06-11 12:35:46 +05:30
Rushabh Mehta
cd4bfa6b9a [docs] added for stock module 2013-06-11 12:04:01 +05:30
Rushabh Mehta
c382eb58d5 [cleanup] removed Featured Item, Website Product Category, Valuation Control 2013-06-11 12:03:37 +05:30
Anand Doshi
27a981677e [buying] [cleanup] deprecated load_default_taxes and get_purchase_tax_details 2013-06-10 16:32:55 +05:30
Anand Doshi
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
 2013-06-10 15:25:07 +05:30
Saurabh
5ee811d842 [removed merge conflict] 2013-06-07 15:23:56 +05:30
Saurabh
5b1e899250 [Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level] 2013-06-07 13:34:16 +05:30
Akhilesh Darjee
426b57e1b4 Deleted item_prices.js 2013-06-07 11:52:15 +05:30
Saurabh
1efc8b3734 [Reprots][No Sales Order From Customer] and [Item Reorder Level] 2013-06-06 19:31:14 +05:30
Akhilesh Darjee
657f8a6677 Completed 'Item Prices' Report 2013-06-06 18:33:26 +05:30
Anand Doshi
9d04924bc2 [selling] [cleanup] rearranged fields 2013-06-05 20:46:56 +05:30
Saurabh
7b48218b6f [Reports][Reorder Level] and [No Sales Order from Customer] 2013-06-05 18:17:28 +05:30
Anand Doshi
12cea9587f [terms and conditions] removed terms html and added terms and conditions to purchase invoice 2013-06-05 14:59:28 +05:30
Anand Doshi
bf3e54a45b [issues #437] [fix] pulling terms and conditions 2013-06-05 14:11:32 +05:30
Anand Doshi
8f81623240 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-05 13:14:11 +05:30
Nabin Hait
c6548b64c2 [fixes][merge conflict] 2013-06-05 12:53:53 +05:30
Nabin Hait
90202aec2b [merge conflict] 2013-06-05 12:37:10 +05:30
Akhilesh Darjee
6653a95767 Completed Warehouse-Wise Stock Balance 2013-06-05 11:36:24 +05:30
Akhilesh Darjee
1725315d10 Finalized batch-wise balance history 2013-06-04 19:35:28 +05:30
Nabin Hait
ad600cce22 bom exploded items grouped by items 2013-06-04 16:56:56 +05:30
Rushabh Mehta
8fefeaf1bd [ui] removed links to old search_criteria and Report2 is now Report 2013-06-04 11:23:42 +05:30
Nabin Hait
0feebc1a67 [status updater] managed by controllers and commonified for sales and purchase 2013-06-03 16:45:38 +05:30
Anand Doshi
ecc28f0311 [sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice 2013-05-30 17:43:30 +05:30
Anand Doshi
200c8f7980 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	selling/doctype/sales_common/sales_common.py
 2013-05-29 12:30:54 +05:30
Anand Doshi
d0b007235d [buying/selling] fixes after responsive merge 2013-05-28 18:54:48 +05:30
Anand Doshi
5d74c82c06 Merge branch 'webshop' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/quotation/quotation.js
 2013-05-28 17:46:50 +05:30
Anand Doshi
923d41dfd2 [selling/buying] [fixes] fixes in client side code, server side code, print formats 2013-05-28 17:23:36 +05:30
Nabin Hait
eca0531068 [report] purchase order/ received items to be billed 2013-05-28 16:07:03 +05:30
Anand Doshi
fc77718a3d [selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying 2013-05-27 19:29:07 +05:30
Rushabh Mehta
e05135c8c4 [fixes to wnf #127 2013-05-27 18:32:20 +05:30
Anand Doshi
149b461e62 Merge branch 'master' of github.com:webnotes/erpnext into webshop 2013-05-24 19:28:36 +05:30
Anand Doshi
3543f30046 [calculations] [client/server] first cut 2013-05-24 19:25:01 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Nabin Hait
f4591ecc24 [stock ledger][fix] message for negative qty error 2013-05-23 19:07:10 +05:30
Nabin Hait
b56412c646 [fixes][aii] cancelled gl entry for delivery note and patch 2013-05-23 17:41:52 +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
0eef6e9e42 Merge branch 'edge' of github.com:webnotes/erpnext into webshop 
Conflicts:
	patches/patch_list.py
 2013-05-15 21:18:27 +05:30
Nabin Hait
ece3298159 [report] requested qty to be transferred 2013-05-13 16:29:50 +05:30
Nabin Hait
da369d8eee [report] requested qty to be ordered 2013-05-13 16:29:28 +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