Nabin Hait
|
096d363087
|
[fix] fixed merge conflict
|
2013-10-18 12:50:28 +05:30 |
|
Anand Doshi
|
7e9048570e
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 12:18:46 +05:30 |
|
Akhilesh Darjee
|
74ec868968
|
[fix] [minor] added for validate in buying controller
|
2013-10-14 13:41:55 +05:30 |
|
Akhilesh Darjee
|
7837827e30
|
[fix] [minor] conversion arte related fixes
|
2013-10-11 19:06:30 +05:30 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Rushabh Mehta
|
2eec1eb9a6
|
[minor] removed prevdoc_date
|
2013-10-10 17:08:19 +05:30 |
|
Rushabh Mehta
|
f56d73c9bc
|
[minor] removed get_rate
|
2013-10-10 17:07:53 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Nabin Hait
|
77f37e6b7c
|
Update Serial No details through serial_no controller
|
2013-10-08 17:11:33 +05:30 |
|
Nabin Hait
|
8f05c05bfb
|
Validate warehouse for allowed users and matched company
|
2013-10-07 13:08:13 +05:30 |
|
Rushabh Mehta
|
acc876e0d7
|
[minor] [fix] status updater, only change communication status when called explicitly
|
2013-10-04 13:33:24 +05:30 |
|
Rushabh Mehta
|
6856d74a1b
|
[minor] fixes to crm patch
|
2013-10-03 18:12:36 +05:30 |
|
Rushabh Mehta
|
800b3aa437
|
[crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order
|
2013-10-03 17:26:33 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Nabin Hait
|
7a75e10a61
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 10:21:20 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Anand Doshi
|
c6d17a6989
|
[fix] [minor] set price list currency and conversion rate
|
2013-09-05 18:18:40 +05:30 |
|
Anand Doshi
|
179e3772c0
|
[fix] [minor] item wise taxes
|
2013-09-05 16:53:57 +05:30 |
|
Nabin Hait
|
bf4d27ecf1
|
[minor] repost future gl entries only for current voucher items
|
2013-09-04 17:55:45 +05:30 |
|
Anand Doshi
|
1dadf35fc7
|
[fix] [minor] [query] sales invoice from delivery note
|
2013-09-03 16:21:01 +05:30 |
|
Anand Doshi
|
36b63a44b9
|
[fix] [minor] profile query
|
2013-09-03 15:33:56 +05:30 |
|
Nabin Hait
|
678130f8db
|
[minor] [cleanup] Landed cost wizard
|
2013-09-02 18:10:36 +05:30 |
|
Anand Doshi
|
215c901a0d
|
[fix] [minor] recreate gl entries when using auto inventory accounting to fix bug introduced due to commit - 5dd6b1d082
|
2013-09-02 15:38:53 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Nabin Hait
|
94c90bdbf9
|
[fix] [minor] buying amount for sales bom item
|
2013-08-30 22:48:19 +05:30 |
|
Nabin Hait
|
bb77756069
|
[fix] [minor] auto accounting for stock transactions
|
2013-08-29 18:19:37 +05:30 |
|
Rushabh Mehta
|
e89c533eaa
|
[sales/purchase] [minor] Set tax table on insert if tax master set, but table missing
|
2013-08-29 15:32:46 +05:30 |
|
Nabin Hait
|
d85d63bb81
|
[minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry
|
2013-08-28 19:24:52 +05:30 |
|
Nabin Hait
|
2e296fa46f
|
[fix] [minor] Repost future gl entries and testcases
|
2013-08-28 18:53:11 +05:30 |
|
Nabin Hait
|
27994c216a
|
[perpetual accounting] gl entries based on stock_value difference in sl entries
|
2013-08-26 16:53:30 +05:30 |
|
Nabin Hait
|
11bd44e447
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:51:46 +05:30 |
|
Nabin Hait
|
9b09c95d83
|
[cleanup] [accounts] delete gl entries on cancellation of accounting transactions
|
2013-08-21 17:47:11 +05:30 |
|
Nabin Hait
|
040d1f3a0e
|
[minor] imported cstr in selling_controller
|
2013-08-21 17:04:33 +05:30 |
|
Nabin Hait
|
e98ab7a2f4
|
[fix] [minor] fixes in updating warranty period of serial no
|
2013-08-21 16:56:12 +05:30 |
|
Nabin Hait
|
9653f60e89
|
[fix] [minor] insert cancelled sl entry for serialized inventory and at the end delete
|
2013-08-20 15:37:33 +05:30 |
|
Nabin Hait
|
c13c193bbc
|
[fix] [minor] update reserved qty
|
2013-08-20 12:28:44 +05:30 |
|
Nabin Hait
|
4ae729bfd2
|
[cleanup] [minor] deprecated cancelled stock ledger entry
|
2013-08-20 12:04:46 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Anand Doshi
|
b02fba9c77
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-19 20:03:51 +05:30 |
|
Anand Doshi
|
2e31e097fa
|
[fix] [minor] _round function - implement round halfs to nearest even number
|
2013-08-19 19:58:23 +05:30 |
|
Nabin Hait
|
76273ebfbc
|
[merge] [minor] Fixed conflict while merging serial_no branch with master
|
2013-08-19 16:26:13 +05:30 |
|
Nabin Hait
|
74c281cc55
|
[cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction
|
2013-08-19 16:17:18 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Nabin Hait
|
21cf403b57
|
[fix] [minor] paid amount should be zero if not pos invoice
|
2013-08-16 15:15:16 +05:30 |
|
Rushabh Mehta
|
170be3b717
|
[minor] merge master
|
2013-08-14 18:41:42 +05:30 |
|
Rushabh Mehta
|
62030e05cc
|
[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master
|
2013-08-14 18:39:27 +05:30 |
|
Anand Doshi
|
3d1ecf5254
|
[fix] [minor] take correct docname when creating contact/address from a previous document
|
2013-08-14 17:22:14 +05:30 |
|
Anand Doshi
|
30324b857a
|
[fix] [minor] set due date in sales invoice after mapping
|
2013-08-14 17:07:42 +05:30 |
|