Commit Graph

5839 Commits

Author SHA1 Message Date
Nabin Hait
90202aec2b [merge conflict] 2013-06-05 12:37:10 +05:30
Anand Doshi
713c18336f [splash] show erpnext 2013-06-05 12:25:28 +05:30
Anand Doshi
d379cb7fe9 [splash] embed svg of splash 2013-06-05 12:12:56 +05:30
Anand Doshi
1510de3ecc [splash] changed back go background image 2013-06-05 11:50:07 +05:30
Anand Doshi
9c8ed8b71f [splash] renamed file 2013-06-05 11:32:11 +05:30
Nabin Hait
aec5553814 bom exploded items grouped by items 2013-06-04 17:20:47 +05:30
Nabin Hait
0323e0048d bom exploded items grouped by items 2013-06-04 17:14:17 +05:30
Nabin Hait
8d7310ac5f bom exploded items grouped by items 2013-06-04 17:11:43 +05:30
Nabin Hait
ecfe1d9cb5 Merge branch 'master' of github.com:webnotes/erpnext 2013-06-04 17:08:34 +05:30
Nabin Hait
89ab4719ff bom exploded items grouped by items 2013-06-04 17:07:57 +05:30
Nabin Hait
1de665752f Merge pull request #429 from saurabh6790/master
Supplier Account Head and Project wise Stock Tracking reports
2013-06-04 04:37:03 -07:00
Saurabh
c95436cf43 changes in sales_invoice.js file 2013-06-04 17:01:06 +05:30
Nabin Hait
ad600cce22 bom exploded items grouped by items 2013-06-04 16:56:56 +05:30
Saurabh
c500a47c36 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-04 16:08:40 +05:30
Saurabh
4bf08fa1cd [Reports][Supplier Account Head -> Account] and [Project wise Stock Tracking -> Project] 2013-06-04 15:51:16 +05:30
Anand Doshi
d64a642974 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-04 15:48:43 +05:30
Anand Doshi
6f1f440f21 [shopping cart] added cart to config json 2013-06-04 15:48:26 +05:30
Rushabh Mehta
dc18529a7f [splash] added erpnext-2013 icon 2013-06-04 15:43:19 +05:30
Rushabh Mehta
f8d2ff30ea [ui] flattified desktop icons 2013-06-04 14:41:49 +05:30
Nabin Hait
df28eefa4b [payment reconciliation] do not allow negative outstanding in case of against_jv 2013-06-04 12:10:33 +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
5c13163e84 Merge branch 'master' of github.com:webnotes/erpnext 2013-06-04 10:49:57 +05:30
Nabin Hait
7407748b29 customer account head report link added in accounts home page 2013-06-04 10:49:08 +05:30
Rushabh Mehta
748f900a3f Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-03 17:40:33 +05:30
Rushabh Mehta
0b1567c51c [docs] updated doctype generator, started page generator, and cleanups 2013-06-03 17:39:54 +05:30
Anand Doshi
52adc34e04 shifted tasks above milestone in Project 2013-06-03 17:04:01 +05:30
Nabin Hait
ae573fa8cc Merge pull request #417 from saurabh6790/master
Customer Account Head Report
2013-06-03 03:51:48 -07:00
Saurabh
df531accc9 [report] customer account head 2013-06-03 16:18:24 +05:30
Saurabh
a0814bb96a [report] customer account head 2013-06-03 16:10:52 +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
e961af40fc [transaction] [fix] fix in purchase transactions 2013-05-31 14:30:46 +05:30
Nabin Hait
4631abfb71 Update production_planning_tool.py 2013-05-31 14:00:07 +05:30
Anand Doshi
53b7342b09 [itemwise tax details] store tax rate as well as tax amount for that item tax combination 2013-05-31 11:50:01 +05:30
Anand Doshi
74a62b17f4 [update file data 2 patch] [fix] auto commit on many writes for the duration of the patch 2013-05-30 23:49:00 +05:30
Anand Doshi
b68fbf0532 [update file size patch] [fix] auto commit on many writes for the duration of the patch 2013-05-30 23:39:24 +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
Nabin Hait
de79aaa131 Update sales_invoice.py 2013-05-30 18:28:30 +05:30
Nabin Hait
5b3b123fe8 Update sales_invoice.py 2013-05-30 17:55:16 +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
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
72edc3d955 [accounts] [auto inventory accounting] changed naming series and message of journal vouchers created for Auto Inventory Accounting 2013-05-29 12:13:16 +05:30
Anand Doshi
e11382de6d Merge branch 'master' of github.com:webnotes/erpnext 2013-05-29 11:42:19 +05:30
Anand Doshi
a3773396f3 [naming series] [fix] added Date in make autoname 2013-05-29 11:41:13 +05:30
Rushabh Mehta
506379da7e [toolbars] removed view / module menus 2013-05-29 11:23:45 +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
Nabin Hait
f6911fb51c Update sales_invoice.py
[fixes] pulling available qty on selection of item in case of pos
2013-05-29 11:06:17 +05:30
Rushabh Mehta
67d1afa481 [grid] allow section breaks and relayout grid 2013-05-29 11:06:03 +05:30
Nabin Hait
df33532280 [fixes] pulling available qty on selection of item in case of pos 2013-05-29 11:03:11 +05:30