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

768 Commits

Author SHA1 Message Date
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
7cd49529f4 [sales invoice][fix] float precision issue 2013-05-24 13:51:25 +05:30
Nabin Hait
93ed5b9dae [sales invoice][fix] check item rate with sales order and delivery note 2013-05-23 19:21:58 +05:30
Nabin Hait
3d75ad1896 [sales invoice][fix] check item rate with sales order and delivery note 2013-05-23 19:14:28 +05:30
Rushabh Mehta
b394a25904 [ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9 2013-05-23 16:03:49 +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
5dc36f416a [permission] delete permission added for pos setting 2013-05-23 12:53:47 +05:30
Nabin Hait
d39b30ab99 [validation] invoice rate will be same as order/delivery 2013-05-23 11:44:18 +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
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Rushabh Mehta
893bb122f2 [docs] added ability to add static pages in docs folder and README.md in modules and doctypes 2013-05-20 13:19:47 +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
ebf3199dbe [fixes] Write off cost center linked to cost center in pur invoice 2013-05-13 11:15:53 +05:30
Anand Doshi
39384d36ea [precision] server side cleanup and client side precision method 2013-05-11 19:39:53 +05:30
Anand Doshi
5af812a832 [precision] [fixes] 2013-05-10 19:23:02 +05:30
Nabin Hait
765383b3cf [report] monthly salary register 2013-05-10 18:41:58 +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
Anand Doshi
ce85145779 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-10 13:38:42 +05:30
Anand Doshi
1252729e1c [sales invoice] [fix] bug fix in setting pos values on save 2013-05-10 13:38:23 +05:30
Nabin Hait
6ac6858571 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-09 16:56:59 +05:30
Nabin Hait
e1b2ae5739 [fixes] float precision for pur invoice 2013-05-09 16:56:19 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +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
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +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
f7bdf8e05a [fixes][jv] set clearance date as null on saving document 2013-05-07 16:48:55 +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
620576080a [fixes][currency symbol] fieldtype in report 2013-05-07 12:03:33 +05:30
Nabin Hait
a55723bea2 [report] sales partners commission 2013-05-06 12:46:07 +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
4cea651a36 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-06 11:36:51 +05:30
Nabin Hait
e23d2a35c4 [fixes] sales/purchase register 2013-05-06 11:08:21 +05:30
Anand Doshi
2a9735a2f1 [pos setting] [permission] removed system manager permission 2013-05-03 14:48:13 +05:30
Anand Doshi
0f5f584651 [stock entry] [test] fixes in test cases 2013-05-03 14:34:12 +05:30
Anand Doshi
d2b8b83e20 [sales invoice] [fetching] fetch customer info, pos settings and item details if not fetched 2013-05-03 13:22:41 +05:30
Anand Doshi
855cf8db21 Merge branch 'pos_fetch' 2013-05-03 11:23:01 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Nabin Hait
4d7a1c1f35 [script report] payments made with ageing 2013-05-02 15:19:00 +05:30
Nabin Hait
d7889cd5d5 [script report] payment collection with ageing 2013-05-02 12:14:59 +05:30
Nabin Hait
02bc8bfe7e Merge branch 'master' of github.com:webnotes/erpnext 2013-05-02 11:39:43 +05:30
Nabin Hait
81bbfba0cc [hr] allowed rename in earning and deduction type 2013-05-02 11:27:25 +05:30
Nabin Hait
006d074b26 [script report] collection report 2013-05-01 15:05:29 +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
2aa9724c6a Merge branch 'master' into pos_fetch 2013-05-01 13:07:42 +05:30
Nabin Hait
e388465e17 [script report] bank clearance summary 2013-05-01 12:23:07 +05:30
Anand Doshi
672cb0c02b Merge branch 'master' of github.com:webnotes/erpnext 2013-05-01 12:04:03 +05:30