Anand Doshi
ee2129ce1c
Merge pull request #4513 from nabinhait/discount_percentage
...
Additional Discount amount based on percentage
2015-12-21 16:13:17 +05:30
Anand Doshi
beed9ae4f8
Merge pull request #4510 from nabinhait/account_merge
...
[fix] Group account merging with sub-ordinate group
2015-12-21 16:03:19 +05:30
Anand Doshi
50ddf921be
[minor] UOM message
2015-12-21 10:58:33 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
15050e326c
Merge pull request #4509 from anandpdoshi/fix/validate-total-transfer-in-material-request
...
[fix] Validate transfer qty cannot be greater than qty
2015-12-18 10:50:36 +05:30
Anand Doshi
0f809426d2
[fix] Validate transfer qty cannot be greater than qty
2015-12-17 22:35:03 +05:30
Nabin Hait
adab5d308c
[fix] Group account merging with sub-ordinate group
2015-12-17 12:53:25 +05:30
Nabin Hait
824122c42a
Merge branch 'ccfiel-develop' into develop
2015-12-17 12:20:40 +05:30
Nabin Hait
afda26e4f3
Fixed conflict
2015-12-17 12:19:58 +05:30
Chris Ian Fiel
d6d354b5c3
By: nabinhait
...
Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".
2015-12-17 09:42:12 +08:00
Chris Ian Fiel
7d310bd182
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2015-12-17 09:18:24 +08:00
Nabin Hait
8b33a6cdc0
Cleanup in cash flow
2015-12-16 16:09:43 +05:30
Anand Doshi
1abe550e65
Merge branch 'develop'
2015-12-16 13:18:41 +05:30
Anand Doshi
5605f8f20e
bumped to version 6.13.1
2015-12-16 13:48:40 +06:00
Anand Doshi
a1580f2781
[language] Added Malayalam - Fixes frappe/translator#62
2015-12-16 13:17:24 +05:30
Anand Doshi
dfdededcf0
[fix] product search limit = 12 instead of 10, since we show it in a grid of 12
2015-12-16 12:57:02 +05:30
Rushabh Mehta
5aa744893d
Merge pull request #4504 from venetanji/master
...
Changelog file naming issue
2015-12-16 10:32:52 +05:30
Giovanni Lion
55cca49371
Changelog file naming issue
2015-12-16 12:29:15 +08:00
Nabin Hait
5e173c7106
Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop
2015-12-15 17:39:55 +05:30
Anand Doshi
cf3da35d67
Merge branch 'develop'
2015-12-15 17:33:02 +05:30
Anand Doshi
a17ddcfe89
bumped to version 6.13.0
2015-12-15 18:03:01 +06:00
Anand Doshi
088826f6f0
[change-log]
2015-12-15 17:28:34 +05:30
Anand Doshi
f89eaa96d1
[docs] Fixed heading and added attribution to 'CWT Connector & Wire Technology GmbH' for german docs
2015-12-15 17:22:15 +05:30
Martin Ender
e526cfe7ec
Update concepts-and-terms.md
2015-12-15 17:22:15 +05:30
Martin Ender
21c189184d
Update concepts-and-terms.md
2015-12-15 17:22:15 +05:30
Martin Ender
2aaebdbe11
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
cda3174a57
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
91eeb76f7b
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
df18c29fb7
Update concepts-and-terms.md
2015-12-15 17:22:14 +05:30
Martin Ender
7aebb39003
Update implementation-strategy.md
2015-12-15 17:22:14 +05:30
Martin Ender
91bb25d0c9
Update implementation-strategy.md
2015-12-15 17:22:14 +05:30
Martin Ender
b89d7eb558
Update implementation-strategy.md
2015-12-15 17:22:14 +05:30
Martin Ender
ba004aab83
Update the-champion.md
2015-12-15 17:22:14 +05:30
Martin Ender
4c3762989b
Update the-champion.md
2015-12-15 17:22:14 +05:30
Martin Ender
225b907a03
Update getting-started-with-erpnext.md
2015-12-15 17:22:14 +05:30
Martin Ender
b543861cbe
Update getting-started-with-erpnext.md
2015-12-15 17:22:14 +05:30
Martin Ender
fc6595b92b
Update getting-started-with-erpnext.md
2015-12-15 17:22:14 +05:30
Martin Ender
d11df3645b
Update getting-started-with-erpnext.md
2015-12-15 17:22:13 +05:30
Martin Ender
ea4c83dcb3
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
3d05635d7a
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
90b0db2d18
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
91a71d4f2c
Update open-source.md
2015-12-15 17:22:13 +05:30
Martin Ender
36ab7f01b4
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
130dd2da61
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
6d15d36639
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
4395d0bc4d
Update do-i-need-an-erp.md
2015-12-15 17:22:13 +05:30
Martin Ender
6e4e2152af
Update print-format.md
2015-12-15 17:22:13 +05:30
Martin Ender
fc5d5d1600
Create print-format.md
2015-12-15 17:22:13 +05:30
Martin Ender
180d7e9ceb
Create hiding-modules-and-features.md
2015-12-15 17:22:12 +05:30
Martin Ender
7be281e712
Create document-title.md
2015-12-15 17:22:12 +05:30
