Rushabh Mehta
|
58ff651c6d
|
fixes to bom.js
|
2014-06-23 12:20:39 +05:30 |
|
Anand Doshi
|
c027563b13
|
Merge pull request #1826 from nabinhait/v4-hotfix
V4 hotfix
|
2014-06-20 20:44:17 +05:30 |
|
Anand Doshi
|
f0a1735ac8
|
Naming Series property type as Text
|
2014-06-20 20:19:51 +05:30 |
|
Nabin Hait
|
56f6d01757
|
Minor fixes
|
2014-06-20 19:37:53 +05:30 |
|
Nabin Hait
|
3c946b2a72
|
validate pricing rule discount with item max discount
|
2014-06-20 19:07:44 +05:30 |
|
Nabin Hait
|
1d37698d4c
|
Reload pricing rule in patch
|
2014-06-20 16:30:44 +05:30 |
|
Nabin Hait
|
be50c289f8
|
validate pricing rule discount with item max discount
|
2014-06-20 16:19:55 +05:30 |
|
Nabin Hait
|
444f956e7b
|
Pricing Rule fixes and improvements. Fixes #1795
|
2014-06-20 16:00:45 +05:30 |
|
Rushabh Mehta
|
b35d84156f
|
Merge pull request #1822 from anandpdoshi/anand-wip
Inventory Accounting: Cost Center only required for Expense Account
|
2014-06-20 11:24:45 +05:30 |
|
Anand Doshi
|
496123a646
|
Inventory Accounting: Cost Center only required for Expense Account
|
2014-06-19 19:25:19 +05:30 |
|
Anand Doshi
|
861747ec26
|
Merge remote-tracking branch 'frappe/develop' into wip-4.1
|
2014-06-19 17:44:33 +05:30 |
|
Anand Doshi
|
7bbaf0298e
|
Merge pull request #1821 from nabinhait/v4-hotfix
Overwrite from POS Settings if value exists
|
2014-06-19 16:48:53 +05:30 |
|
Rushabh Mehta
|
a2f5a7f3cd
|
Merge pull request #1820 from anandpdoshi/anand-wip
Validate Select Fields
|
2014-06-19 16:32:50 +05:30 |
|
Anand Doshi
|
a5cfc59d81
|
Validate Select field values
|
2014-06-19 16:05:08 +05:30 |
|
Anand Doshi
|
da342c7855
|
Fixed feed type options
|
2014-06-18 21:09:19 +05:30 |
|
Anand Doshi
|
aecddefbc8
|
Fixed number format in currency
|
2014-06-18 20:55:39 +05:30 |
|
Anand Doshi
|
fd05f458e1
|
Minor fix in Journal Voucher
|
2014-06-18 20:55:18 +05:30 |
|
Nabin Hait
|
faf176d78c
|
Overwrite from POS Settings if value exists
|
2014-06-18 19:52:24 +05:30 |
|
Rushabh Mehta
|
151125e537
|
fixed for travis
|
2014-06-18 17:33:01 +05:30 |
|
Anand Doshi
|
64a0eb42ed
|
Merge pull request #1816 from nabinhait/v4-hotfix
Stock Entry incoming rate
|
2014-06-18 17:32:04 +05:30 |
|
Nabin Hait
|
ba6cc2864a
|
Merge pull request #1817 from anandpdoshi/anand-wip
Fixed Employee Leave Balance Report
|
2014-06-18 17:18:26 +05:30 |
|
Nabin Hait
|
4d7c4fc0f4
|
Get party details fixes
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
e7c2f74a07
|
Stocvk entry incoming rate for sales return
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
a7da6e1480
|
Incoming rate for sales return
|
2014-06-18 16:40:59 +05:30 |
|
Nabin Hait
|
ae0d753cad
|
Valuation rate and amount for fg item
|
2014-06-18 16:40:59 +05:30 |
|
Anand Doshi
|
31c977b906
|
Fixed Employee Leave Balance Report
|
2014-06-18 16:26:45 +05:30 |
|
Nabin Hait
|
87179346d4
|
Merge pull request #1814 from anandpdoshi/anand-wip
Don't set warehouse when creating serial no, fixed currency exchange error message
|
2014-06-18 16:00:53 +05:30 |
|
Anand Doshi
|
d768afb80b
|
Fixed Sales Order -> Delivery Note mapping of address fields
|
2014-06-18 15:23:25 +05:30 |
|
Anand Doshi
|
de12a0941f
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-18 14:05:29 +05:30 |
|
Anand Doshi
|
987a28fc6a
|
Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
|
2014-06-18 14:05:08 +05:30 |
|
Anand Doshi
|
c5dbf0f8ad
|
Travis: Install frappe of targetted branch
For example:
If pull request is for wip-4.1 branch of erpnext, install frappe with branch as wip-4.1
|
2014-06-18 13:35:37 +05:30 |
|
Anand Doshi
|
297939325a
|
Stock Entry: get fg item incoming rate if bom is mentioned
|
2014-06-18 13:10:10 +05:30 |
|
Anand Doshi
|
2f800521cb
|
Don't set default for warehouse when creating serial no
|
2014-06-18 12:48:46 +05:30 |
|
Anand Doshi
|
72a178a37e
|
Fixed Currency Exchange error
|
2014-06-18 12:14:17 +05:30 |
|
Anand Doshi
|
8c7b4549ed
|
Merge pull request #1812 from nabinhait/v4-hotfix
Multiple fixes
|
2014-06-18 10:59:05 +05:30 |
|
Nabin Hait
|
91090042d1
|
Patch: update users report view settings for rename fields
|
2014-06-18 10:29:53 +05:30 |
|
Nabin Hait
|
0693937c1e
|
Fixes in fetching valuation rate in stock entry
|
2014-06-18 10:20:01 +05:30 |
|
Nabin Hait
|
ac1a4ed576
|
Field renamed in sms center
|
2014-06-18 10:20:01 +05:30 |
|
Nabin Hait
|
b73d3f925d
|
Do not make packing list after submission
|
2014-06-18 10:18:50 +05:30 |
|
Rushabh Mehta
|
69641ddc36
|
Update sms_center.json
changed total words to total characters
|
2014-06-18 09:04:09 +05:30 |
|
Rushabh Mehta
|
36881807ed
|
Merge branch 'wip-4.2' into wip-4.1
|
2014-06-17 17:36:22 +05:30 |
|
Rushabh Mehta
|
1a18b427a8
|
make font size smaller for erpnext powered
|
2014-06-17 16:54:55 +05:30 |
|
Rushabh Mehta
|
69ce97b80a
|
added print format for general ledger
|
2014-06-17 16:54:55 +05:30 |
|
Rushabh Mehta
|
9f887b436c
|
fixes new routing, for frappe/frappe#600
|
2014-06-17 16:53:44 +05:30 |
|
Anand Doshi
|
5780163fb7
|
Merge remote-tracking branch 'frappe/develop' into wip-4.1
|
2014-06-17 14:58:18 +05:30 |
|
Anand Doshi
|
1c5fb9495e
|
Merge pull request #1806 from nabinhait/v4-hotfix
Fixes
|
2014-06-17 14:54:44 +05:30 |
|
Rushabh Mehta
|
5df521bad5
|
updated generators for wip-4.2
|
2014-06-17 14:21:26 +05:30 |
|
Nabin Hait
|
be75d0265b
|
Merge pull request #1805 from anandpdoshi/anand-wip
Sales Invoice List: show percent paid as 100% if grand total is 0
|
2014-06-17 14:12:26 +05:30 |
|
Anand Doshi
|
b20de6a3ec
|
Sales Invoice List: show percent paid as 100% if grand total is 0
|
2014-06-17 13:58:06 +05:30 |
|
Nabin Hait
|
4ee8704b99
|
Fixes in financial analytics
|
2014-06-17 13:52:03 +05:30 |
|