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

218 Commits

Author SHA1 Message Date
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Rushabh Mehta
aaac794a8e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:08:04 +01:00
Nabin Hait
40d4b4d939 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:34:13 +05:30
Nabin Hait
2f82219fd0 item query changes in stock entry 2012-03-22 10:32:06 +05:30
Nabin Hait
9066dcaba5 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:26:07 +05:30
Nabin Hait
bad13149b2 item query changes in stock entry 2012-03-22 10:24:26 +05:30
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Rushabh Mehta
c1f8af58d1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:29:06 +01:00
Nabin Hait
2a68bdf231 Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:50:14 +05:30
Rushabh Mehta
e07c38f5f5 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:06:38 +01:00
Nabin Hait
c37cb4d7c3 Update erpnext/stock/doctype/stock_entry/stock_entry.js 2012-03-21 15:35:41 +05:30
Nabin Hait
ac9adff1bb Update erpnext/stock/doctype/stock_entry/stock_entry.py 2012-03-21 15:35:04 +05:30
Nabin Hait
7ff14ede3c Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:33:50 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
0d1e918177 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 06:33:35 +01:00
Nabin Hait
39a24794eb Purpose others to other 2012-03-21 11:02:50 +05:30
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Nabin Hait
93654a3e04 stock entry: new purpose others added 2012-03-20 14:31:14 +05:30
Rushabh Mehta
8d8fa66e8f Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 14:06:12 +01:00
Nabin Hait
b7dce7da31 Update erpnext/stock/doctype/delivery_note/delivery_note.js 2012-03-19 18:35:57 +05:30
Rushabh Mehta
a0a53c90f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 06:12:43 +01:00
Nabin Hait
15a0271557 Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt 2012-03-19 10:22:32 +05:30
Nabin Hait
9f5b2cd8d9 Update erpnext/stock/doctype/delivery_note/delivery_note.txt 2012-03-19 10:20:22 +05:30
Rushabh Mehta
2f052fd1ff Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 07:22:39 +01:00
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
3b3e336fcc Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-14 13:25:19 +01:00
Anand Doshi
0e2461fa7c fix in qa inspection report link 2012-03-14 17:53:53 +05:30
Rushabh Mehta
0dd5da2299 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9 removed 2012-03-06 18:41:11 +05:30
Nabin Hait
a528f54dcb serial no fld print_hide=0 2012-03-05 17:45:38 +05:30
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Nabin Hait
07e9ff3d30 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05 field order changed 2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987 fix in delivery note detail double entry 2012-03-03 16:27:48 +05:30
Anand Doshi
146f17bf57 fix in delivery note submission - error caused due to default packed qty 2012-03-03 15:01:41 +05:30
Nabin Hait
0d155a9135 print hide issue 2012-03-02 14:57:44 +05:30
Nabin Hait
1841d8defa pr/dn no mapping through sales/pur return 2012-03-02 14:57:27 +05:30
Nabin Hait
88986ca007 column break print hide issue 2012-03-02 12:29:08 +05:30
Nabin Hait
760e91e949 print hide issue fixed in dn 2012-03-01 19:23:21 +05:30
Nabin Hait
f237a67183 transaction date issue in mapper 2012-03-01 18:03:47 +05:30
Anand Doshi
496d9a0980 Merge branch 'master' into navupdate 2012-03-01 14:55:22 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Nabin Hait
eaf144a545 form cleanup in pur cycle 2012-03-01 13:05:04 +05:30
Nabin Hait
e73db0e331 set serial_no status="In Store" if purchase return cancelled 2012-03-01 12:26:12 +05:30
Nabin Hait
bb4539e458 fixed conflict in version 2012-03-01 10:58:48 +05:30
Nabin Hait
6d517ff005 form cleanup: fixed callback issues 2012-03-01 10:57:23 +05:30
Rushabh Mehta
a4f454faa0 module page link fix 2012-02-29 19:19:01 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Nabin Hait
5b09122264 fixed conflict while merging 2012-02-27 12:52:46 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Rushabh Mehta
085617ed12 merge latest 2012-02-21 17:31:04 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Anand Doshi
ff33677624 Packing Slip Fix 2012-02-21 16:26:08 +05:30
Nabin Hait
1a7cd16dba reorder qty fld in item 2012-02-21 13:26:49 +05:30
Nabin Hait
5fe6760406 reorder level checking based on stores and reserved warehouse 2012-02-21 13:25:27 +05:30
Anand Doshi
e31d94ffc4 fix in control panel issue of sales and purchase return wizard 2012-02-17 10:27:46 +05:30
Nabin Hait
195b620787 callback issue in packing slip 2012-02-16 15:21:39 +05:30
Nabin Hait
2d8ac7f3f9 fixed asynchronus issue 2012-02-15 17:31:23 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Anand Doshi
82cfe4b28d Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 15:30:24 +05:30
Anand Doshi
702f174265 call update item details in post render 2012-02-13 15:29:41 +05:30
Nabin Hait
043b0f26bd Merge branch 'stable' of github.com:webnotes/erpnext 2012-02-13 12:26:45 +05:30
Nabin Hait
b0fd0b3615 Edited through patch 2012-02-13 11:34:36 +05:30
Anand Doshi
15d2d45b36 Merge branch 'stable' into latest 2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b Debit/Credit note creation on purchase/sales return 2012-02-10 10:48:35 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest 
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
 2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Anand Doshi
99e7f3d7a4 Fix in valuation_control.py: eval requires a string. does not accept None. 2012-02-06 18:06:34 +05:30
Anand Doshi
a9a5128402 Merge branch 'stable' into latest 
Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
 2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Anand Doshi
4f948e03be Set docstatus as 2 for a purchase returned serial no 2012-02-01 11:27:36 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Anand Doshi
6afc6818a3 Check for duplicate challan number only in submitted purchase receipts 2012-01-31 17:21:04 +05:30
Anand Doshi
0717ca63b2 Fix in Purchase Return - Serial No. status issue 2012-01-31 16:20:37 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
c655e37f1a Fixes in production and stock modules 2012-01-25 09:58:06 +05:30
Anand Doshi
869c7bcbb2 Validate if another GRN exists having same supplier and challan no. - then throw exception 2012-01-19 18:31:21 +05:30
Anand Doshi
d3a23b5e8c Item Manufacturer/Supplier Details in item doctype 2012-01-17 18:46:43 +05:30
Anand Doshi
2bc9423cd1 Fix: Backflush issue due to missing BOM 2012-01-12 12:32:13 +05:30
Nabin Hait
c5d6bcbb8f Production module cleanup 2012-01-11 16:41:16 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-10 13:59:04 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Anand Doshi
58455c9d8e Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed 2012-01-06 14:33:57 +05:30
Nabin Hait
a9cca2e2e9 error fixed in reorder indent 2012-01-05 14:10:14 +05:30
Nabin Hait
2abc6026f2 reload po-pr mapper 2012-01-05 11:24:49 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable 
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
 2012-01-03 11:45:11 +05:30
Nabin Hait
a21156d4d3 Removed msgprint 2011-12-30 11:16:15 +05:30