Rushabh Mehta
|
06d186ba98
|
[stock] [feature] added project to stock ledger entry and updated stock balance report
|
2013-03-25 17:03:52 +05:30 |
|
Rushabh Mehta
|
c5570c6341
|
added warehouse company validation, if warehouse is added to company
|
2013-03-25 15:21:24 +05:30 |
|
Nabin Hait
|
690fefe9c1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-25 11:07:38 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Anand Doshi
|
ceba917e86
|
Merge branch 'master' into edge
|
2013-03-22 14:16:53 +05:30 |
|
Anand Doshi
|
a47ac1bed0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-22 13:32:11 +05:30 |
|
Nabin Hait
|
9d3f0405b7
|
fixes in packing slip
|
2013-03-22 12:02:48 +05:30 |
|
Anand Doshi
|
8c5844e3fb
|
show sales invoice data in gross profit report
|
2013-03-21 20:24:10 +05:30 |
|
Anand Doshi
|
6d8d3b4cee
|
fixes in gross profit report
|
2013-03-21 18:45:02 +05:30 |
|
Nabin Hait
|
4c56220089
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-21 18:37:48 +05:30 |
|
Nabin Hait
|
a0e7c1539b
|
aii: book expense in delivery note instead of sales invoice
|
2013-03-21 18:37:06 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Anand Doshi
|
162a081a9f
|
unchecked Not In Create in item customer detail and item price
|
2013-03-21 17:30:22 +05:30 |
|
Rushabh Mehta
|
bed19ac4d3
|
added website pages for orders, tickets and added sales invoice print format
|
2013-03-21 17:12:25 +05:30 |
|
Nabin Hait
|
364f08a171
|
fixed conflict
|
2013-03-19 18:29:05 +05:30 |
|
Nabin Hait
|
80abad2ee0
|
aii: default account from company
|
2013-03-19 18:18:52 +05:30 |
|
Anand Doshi
|
a2b3eb17e3
|
fix in depends on of stock entry
|
2013-03-19 17:48:50 +05:30 |
|
Anand Doshi
|
9a20cc5cd8
|
Merge branch 'sales_purchase_return'
|
2013-03-19 16:23:11 +05:30 |
|
Anand Doshi
|
3e967ab9b6
|
hide Reference section break when using Sales or Purchase Return
|
2013-03-19 16:22:22 +05:30 |
|
Anand Doshi
|
73091ecac3
|
shifted return reference fields in stock entry to the main section
|
2013-03-19 15:15:12 +05:30 |
|
Anand Doshi
|
f6b06a6b30
|
fixes in sales purchase return
|
2013-03-19 15:01:07 +05:30 |
|
Anand Doshi
|
af6f1ba82e
|
fixes in sales purchase return for stock entry
|
2013-03-19 13:43:49 +05:30 |
|
Anand Doshi
|
f9e51bbab3
|
removed complications from sales purchase return
|
2013-03-19 13:33:51 +05:30 |
|
Nabin Hait
|
e68103be30
|
fixes in reorder level and company
|
2013-03-19 12:34:47 +05:30 |
|
Nabin Hait
|
928355ad9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-19 12:02:13 +05:30 |
|
Nabin Hait
|
89a94d8135
|
aii: stock reconciliation with test case
|
2013-03-19 12:01:46 +05:30 |
|
Nabin Hait
|
c3afb256b4
|
aii: stock entry
|
2013-03-19 12:01:24 +05:30 |
|
Nabin Hait
|
35e037651c
|
fixes in packing slip
|
2013-03-19 11:58:57 +05:30 |
|
Anand Doshi
|
839fee3e71
|
restrict material_request_type in Material Request form
|
2013-03-18 18:20:09 +05:30 |
|
Anand Doshi
|
080f9098c0
|
deprecated sales and purchase return tool
|
2013-03-18 17:57:59 +05:30 |
|
Anand Doshi
|
f11e2f8f6f
|
Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return
Conflicts:
patches/patch_list.py
|
2013-03-18 17:42:08 +05:30 |
|
Anand Doshi
|
ab7b7c2974
|
completed sales purchase return as part of stock entry
|
2013-03-18 17:37:31 +05:30 |
|
Anand Doshi
|
6230aa9292
|
make return jv for sales return
|
2013-03-16 19:05:11 +05:30 |
|
Anand Doshi
|
1524c2a5b6
|
create return jv
|
2013-03-15 17:42:45 +05:30 |
|
Anand Doshi
|
87052b366b
|
validate over-return of stock for sales purchase return
|
2013-03-15 11:32:40 +05:30 |
|
Rushabh Mehta
|
ebee1c7033
|
website module: minor updates
|
2013-03-14 14:33:31 +05:30 |
|
Anand Doshi
|
47428c2d92
|
more test cases for stock entry
|
2013-03-13 15:30:05 +05:30 |
|
Anand Doshi
|
23d742693a
|
Merge branch 'master' into sales_purchase_return
|
2013-03-13 14:01:34 +05:30 |
|
Anand Doshi
|
71bed3116f
|
working on merging sales purchase return into stock entry
|
2013-03-13 12:57:04 +05:30 |
|
Nabin Hait
|
4ceb1b5164
|
aii: gl entries for stock entry and testcases
|
2013-03-13 11:40:30 +05:30 |
|
Nabin Hait
|
06ae34b015
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 15:47:55 +05:30 |
|
Nabin Hait
|
4f856f1250
|
fixes in buying_amount_calculation
|
2013-03-12 15:44:38 +05:30 |
|
Anand Doshi
|
6dc6e7c84a
|
minor fixes in stock entry js
|
2013-03-12 12:51:53 +05:30 |
|
Anand Doshi
|
4127bb14ed
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 12:48:10 +05:30 |
|
Nabin Hait
|
0cfbc5feb5
|
fixes in sales order test cases and set_buying_amount
|
2013-03-12 11:34:56 +05:30 |
|
Anand Doshi
|
c9d229ec9e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-12 11:06:06 +05:30 |
|
Nabin Hait
|
f7df8b28d2
|
-m
|
2013-03-12 10:58:11 +05:30 |
|
Anand Doshi
|
df6ff1385f
|
fixes in warehouse validation
|
2013-03-11 19:44:52 +05:30 |
|
Nabin Hait
|
8c7234f270
|
aii: gl_entries for sales invoice
|
2013-03-11 16:32:33 +05:30 |
|
Anand Doshi
|
d5aeb21dd9
|
fix in get_value_diff of stock grid report: case for serialized items
|
2013-03-08 12:46:48 +05:30 |
|
Nabin Hait
|
0e6ce9af17
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 18:50:23 +05:30 |
|
Anand Doshi
|
f1e274c8b4
|
when cancelling stock ledger entry, change modified and modified by
|
2013-03-07 16:34:59 +05:30 |
|
Nabin Hait
|
ad7266e48d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-07 11:42:47 +05:30 |
|
Nabin Hait
|
58b2a101ae
|
aii: testcases for sales invoice gl entries
|
2013-03-07 11:42:14 +05:30 |
|
Anand Doshi
|
80f7637ae6
|
added print width in txts of istable type doctypes
|
2013-03-07 11:37:33 +05:30 |
|
Nabin Hait
|
a72c5127a6
|
aii: gl entries for delivery note
|
2013-03-06 18:50:53 +05:30 |
|
Rushabh Mehta
|
ba7ed4c27c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-05 14:20:24 +05:30 |
|
Rushabh Mehta
|
07287e8b93
|
removed colour fields from txt files
|
2013-03-05 14:19:48 +05:30 |
|
Anand Doshi
|
9e69dc5ad8
|
fix in material request test case
|
2013-03-05 13:39:28 +05:30 |
|
Anand Doshi
|
1f3a5c3798
|
use validate value method to validate valuation rate should be greater than 0 in stock entry
|
2013-03-05 12:25:15 +05:30 |
|
Nabin Hait
|
4c5af2f33d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-04 15:36:27 +05:30 |
|
Nabin Hait
|
0d20d6fdd2
|
fixes for purchase price list
|
2013-03-04 15:35:45 +05:30 |
|
Anand Doshi
|
91484391ce
|
invalidate cache if 'show in website' is unchecked for item and item group
|
2013-03-04 14:28:38 +05:30 |
|
Rushabh Mehta
|
ba0e1ea194
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-01 19:09:38 +05:30 |
|
Rushabh Mehta
|
213b180060
|
merge, update bean validations
|
2013-03-01 19:09:06 +05:30 |
|
Nabin Hait
|
54d209ffb0
|
sub-contracting code refactored for po
|
2013-03-01 18:51:10 +05:30 |
|
Nabin Hait
|
73b2bb6f91
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-01 17:40:31 +05:30 |
|
Nabin Hait
|
37ef553f6b
|
fixes for sub_contracting
|
2013-03-01 17:39:41 +05:30 |
|
Anand Doshi
|
a10461e16c
|
minor fix in purchase receipt
|
2013-03-01 16:12:50 +05:30 |
|
Anand Doshi
|
322bd08f26
|
allow attachment in batch
|
2013-03-01 12:52:34 +05:30 |
|
Anand Doshi
|
b05185ba96
|
hide website fields function removed
|
2013-02-28 18:49:17 +05:30 |
|
Rushabh Mehta
|
b21eb9ac09
|
added time log batch
|
2013-02-28 18:42:46 +05:30 |
|
Anand Doshi
|
4a36e479c1
|
fix in subcontracted validation
|
2013-02-28 17:41:03 +05:30 |
|
Nabin Hait
|
86dc888648
|
datetime issue in stock balance repory
|
2013-02-28 17:09:08 +05:30 |
|
Nabin Hait
|
a71ace0d74
|
fixed asynchronus issue in purchase cycle
|
2013-02-28 16:30:53 +05:30 |
|
billyfordson
|
9b352309c6
|
Adding German translation
|
2013-02-27 17:36:23 +01:00 |
|
Anand Doshi
|
55d9a62114
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-02-27 18:14:28 +05:30 |
|
Nabin Hait
|
5418d71fc0
|
sub-contracting rewrite with testcases
|
2013-02-27 18:11:17 +05:30 |
|
Anand Doshi
|
4a7248ee0b
|
commonified some purchase code, added test case for auto inventory accounting for purchase invoice
|
2013-02-27 18:10:30 +05:30 |
|
Anand Doshi
|
a1d4b78fbe
|
started with Auto Inventory Accounting - test case for purchase receipt
|
2013-02-26 18:09:47 +05:30 |
|
Rushabh Mehta
|
29786e38df
|
added get_value, fixed appframe from Single
|
2013-02-26 14:27:03 +05:30 |
|
Anand Doshi
|
805fdf313c
|
shifted item name and description fields to the left of stock reports
|
2013-02-26 12:23:39 +05:30 |
|
Anand Doshi
|
7f27d34f81
|
Material Request - Print Heading as a Link field
|
2013-02-25 15:38:28 +05:30 |
|
Rushabh Mehta
|
e4eb89b02a
|
added new language and filters in query reports
|
2013-02-25 13:00:16 +05:30 |
|
Rushabh Mehta
|
9e02949821
|
updated language and separated slickgrid files
|
2013-02-25 11:05:27 +05:30 |
|
Rushabh Mehta
|
90098d2ebd
|
new employee_leave_balance_report
|
2013-02-22 17:54:50 +05:30 |
|
Nabin Hait
|
8a14cdb45d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-22 12:45:40 +05:30 |
|
Nabin Hait
|
87d270a5b5
|
refactored code for reserved qty with testcases
|
2013-02-22 12:44:51 +05:30 |
|
Rushabh Mehta
|
c359a58766
|
added Item Name in pending type query reports
|
2013-02-22 10:48:07 +05:30 |
|
Anand Doshi
|
561556db58
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-21 19:51:10 +05:30 |
|
Anand Doshi
|
9a17051c8d
|
material request should update bin, even if it is of type Material Transfer
|
2013-02-21 19:44:55 +05:30 |
|
Rushabh Mehta
|
86039fc614
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-21 16:58:27 +05:30 |
|
Rushabh Mehta
|
f41dd39286
|
added language
|
2013-02-21 16:57:54 +05:30 |
|
Anand Doshi
|
1678f6d4ae
|
update requested quantity in bin for both Purchase as well as Transfer type material request
|
2013-02-21 16:55:14 +05:30 |
|
Nabin Hait
|
c924c1ebb5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-21 14:53:42 +05:30 |
|
Nabin Hait
|
9082fad994
|
testcases for reserved qty
|
2013-02-21 14:49:44 +05:30 |
|
Anand Doshi
|
a96ba7b326
|
auto material request should be submitted
|
2013-02-21 14:38:24 +05:30 |
|
Anand Doshi
|
51fc7c0683
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-21 12:23:58 +05:30 |
|
Anand Doshi
|
c64da278ca
|
fixed auto material request email
|
2013-02-21 12:04:42 +05:30 |
|
Nabin Hait
|
8f7899a642
|
added stopped condition in pending to deliver/received/billed report
|
2013-02-21 11:44:08 +05:30 |
|