Commit Graph

34 Commits

Author SHA1 Message Date
Nabin Hait
c6548b64c2 [fixes][merge conflict] 2013-06-05 12:53:53 +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
c7b8c4a414 [move update stock to pos] set update_stock = 0 in old sales invoice where is_pos = 0 2013-05-31 16:31:44 +05:30
Anand Doshi
f41ce11e91 [taxes and charges] [item wise tax detail] patch to store this as json 2013-05-30 19:18:51 +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
Rushabh Mehta
c6f890f892 [merge] 2013-05-29 13:19:27 +05:30
Anand Doshi
047442efa2 [notes] [fix] fix in note patch 2013-05-29 11:07:11 +05:30
Rushabh Mehta
f32ee3c28e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-05-29 11:07:05 +05:30
Rushabh Mehta
67d1afa481 [grid] allow section breaks and relayout grid 2013-05-29 11:06:03 +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
Rushabh Mehta
6986fc7ff3 [comment] fix creation, deltion, close #131 2013-05-28 13:09:23 +05:30
Rushabh Mehta
74560b32c1 [website] updates for bootstrap3 2013-05-27 14:47:56 +05:30
Anand Doshi
5dfba486a6 [note] [fix] strip invalid characters from title and set it as the name of the note 2013-05-27 12:25:28 +05:30
Anand Doshi
149b461e62 Merge branch 'master' of github.com:webnotes/erpnext into webshop 2013-05-24 19:28:36 +05:30
Rushabh Mehta
b4a2949c37 [knowledge base] removed and added patch to move to notes 2013-05-24 16:33:21 +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
Anand Doshi
ace9cbad9e [support] [fix] [patch] reload support ticket and communication before the patch 2013-05-22 12:22:29 +05:30
Anand Doshi
5be11b44ac Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	controllers/buying_controller.py
2013-05-21 19:40:09 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Nabin Hait
cb99045764 [patch] update lead, contact in support ticket 2013-05-21 17:17:40 +05:30
Nabin Hait
f8525fea06 [fixes][patch] update valuation rate in purchase cycle and repost patch 2013-05-20 15:30:02 +05:30
Nabin Hait
9053cbc9f8 [fixes][patch] update valuation rate in purchase cycle and repost patch 2013-05-20 15:28:44 +05:30
Nabin Hait
031b7b3069 [fixes] repost stock: commit after every 20 2013-05-20 12:19:57 +05:30
Anand Doshi
b5aa8da0dd Merge branch 'edge' of github.com:webnotes/erpnext into webshop 2013-05-17 15:12:49 +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
d37ac68f1b [fixes] fixes in patch 2013-05-17 13:17:01 +05:30
Nabin Hait
b9669de3ff [patch] repost_stock: commit after every 50 2013-05-17 12:21:13 +05:30
Nabin Hait
f826b93a75 [patch] set conversion factor in pur invoice and repost stock_received_but_not_billed patch 2013-05-17 12:19:50 +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
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
4e1dcfc561 [patch] repost stock for no posting date 2013-05-10 15:17:20 +05:30