Rushabh Mehta
|
955b979a97
|
Merge pull request #6183 from KanchanChauhan/columns-added-deleted
Coded columns deleted, columns added from UI
|
2016-08-26 14:34:50 +05:30 |
|
Kanchan Chauhan
|
dd96cbd012
|
Coded column deleted, column added from UI
|
2016-08-26 14:32:38 +05:30 |
|
Nabin Hait
|
4403cf71b5
|
Merge pull request #6152 from rohitwaghchaure/profitability_report
[Report] Profitability Analysis
|
2016-08-26 13:21:01 +05:30 |
|
Rohit Waghchaure
|
69aebf4db5
|
fixes test cases, added patch
|
2016-08-26 13:18:14 +05:30 |
|
Rohit Waghchaure
|
0cb171feb2
|
[Enhancement] Added billing hours for account user in timesheet
|
2016-08-26 13:17:46 +05:30 |
|
Nabin Hait
|
e334813daf
|
Merge pull request #6166 from neilLasrado/demo
Merged Schools Demo into ERPNext
|
2016-08-26 13:05:43 +05:30 |
|
Rohit Waghchaure
|
6462ba4e0b
|
minor changes
|
2016-08-26 12:42:52 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Nabin Hait
|
f92f04bffc
|
Merge branch 'hotfix'
|
2016-08-26 12:37:19 +05:30 |
|
Nabin Hait
|
6592899741
|
bumped to version 7.0.33
|
2016-08-26 13:07:19 +06:00 |
|
Nabin Hait
|
06b27757ab
|
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
[Sales Return] Minor fix in patch
|
2016-08-26 12:33:33 +05:30 |
|
Rohit Waghchaure
|
e21e1ebae2
|
[Sales Return] Minor fix in patch
|
2016-08-26 12:31:41 +05:30 |
|
Nabin Hait
|
0a99b4347b
|
Party mandatory message
|
2016-08-26 12:30:45 +05:30 |
|
Nabin Hait
|
a26bb96d2d
|
Merge pull request #6178 from nabinhait/status_updater_fix
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 12:09:39 +05:30 |
|
Nabin Hait
|
e244cde9c3
|
Merge pull request #6158 from KanchanChauhan/salary-structure-layout
Layout changes in Salary Structure
|
2016-08-26 12:00:29 +05:30 |
|
Nabin Hait
|
c97f7cac80
|
Merge pull request #6162 from strixaluco/patch-1
[minor] docs typo fix
|
2016-08-26 11:59:11 +05:30 |
|
Nabin Hait
|
fbe1563101
|
Merge pull request #6168 from rohitwaghchaure/hotfix
[POS] Fixed payment gl entry for sales return
|
2016-08-26 11:58:46 +05:30 |
|
Nabin Hait
|
47a3f639ed
|
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 11:39:39 +05:30 |
|
Nabin Hait
|
6b8435c902
|
Merge pull request #6172 from joopdorresteijn/patch-1
Update user-restriction.md
|
2016-08-26 10:50:54 +05:30 |
|
Neil Trini Lasrado
|
067245933e
|
Fixed Demo
|
2016-08-25 18:31:42 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rushabh Mehta
|
cdfd35c9ca
|
New Languages added:
frappe/translations/am.csv
frappe/translations/en-US.csv
frappe/translations/en.csv
frappe/translations/es-AR.csv
frappe/translations/es-CL.csv
frappe/translations/es-GT.csv
frappe/translations/es-MX.csv
frappe/translations/es-NI.csv
frappe/translations/fr-CA.csv
frappe/translations/ku.csv
frappe/translations/lo.csv
frappe/translations/lt.csv
frappe/translations/ps.csv
frappe/translations/rw.csv
frappe/translations/sr-SP.csv
|
2016-08-25 15:23:40 +05:30 |
|
Nabin Hait
|
385311c8a2
|
Merge pull request #6170 from rohitwaghchaure/patch_fix
[Fix] 'SalesInvoice' object has no attribute 'account_for_change_amount'
|
2016-08-25 14:41:47 +05:30 |
|
joopdorresteijn
|
8da1e9eeb8
|
Update user-restriction.md
Sales user also doesn't exist
|
2016-08-25 15:46:24 +08:00 |
|
Rohit Waghchaure
|
0788ee62c1
|
Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount'
|
2016-08-25 12:46:34 +05:30 |
|
strixaluco
|
5380a1c56a
|
Update price-lists.md
Repetitive sentence removed.
|
2016-08-25 10:40:42 +08:00 |
|
Rohit Waghchaure
|
1e8732abc2
|
removed old report
|
2016-08-24 19:20:58 +05:30 |
|
Rohit Waghchaure
|
5794ffd43d
|
added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis
|
2016-08-24 19:12:14 +05:30 |
|
Rohit Waghchaure
|
1255a6627e
|
project based profitability Analysis
|
2016-08-24 18:01:39 +05:30 |
|
Rohit Waghchaure
|
78e08b8af5
|
[Report] Profitability Analysis
|
2016-08-24 18:00:22 +05:30 |
|
Rohit Waghchaure
|
fb432821bf
|
[Report] Cost center wise profitability
|
2016-08-24 18:00:22 +05:30 |
|
Rushabh Mehta
|
b9b36a2062
|
[minor] update salary structure company if not set
|
2016-08-24 15:20:43 +05:30 |
|
Rushabh Mehta
|
caeb9dc025
|
[minor] update salary structure company if not set
|
2016-08-24 15:14:48 +05:30 |
|
Rushabh Mehta
|
5fb2bc2b87
|
[fix] [versioning]
|
2016-08-24 12:51:45 +05:30 |
|
Rushabh Mehta
|
547dff5d5b
|
[version] 7.1-beta
|
2016-08-24 12:44:32 +05:30 |
|
strixaluco
|
7d60dd7e21
|
Update price-lists.md
|
2016-08-24 09:42:07 +08:00 |
|
strixaluco
|
a623a59f9e
|
[minor] docs typo fix
availale → available
|
2016-08-24 09:36:17 +08:00 |
|
Rushabh Mehta
|
fcb793e4dd
|
[minor] language fields are now links
|
2016-08-23 16:51:18 +05:30 |
|
Kanchan Chauhan
|
22073f3a7f
|
Layout changes in Salary Structure
|
2016-08-23 16:14:04 +05:30 |
|
Nabin Hait
|
ec6267e82a
|
Merge branch 'hotfix'
|
2016-08-23 12:10:56 +05:30 |
|
Nabin Hait
|
cfbd0199eb
|
Merge branch 'master' into develop
|
2016-08-23 12:10:56 +05:30 |
|
Nabin Hait
|
db05ac2414
|
bumped to version 7.0.32
|
2016-08-23 12:40:56 +06:00 |
|
Nabin Hait
|
f862505bf9
|
Merge pull request #6153 from rohitwaghchaure/hotfix
[POS] Fixed decimal button not working
|
2016-08-23 12:07:40 +05:30 |
|
Rohit Waghchaure
|
ea6d7e9b09
|
[Fix] decimal button not working
|
2016-08-23 11:39:44 +05:30 |
|
Nabin Hait
|
26f9673ad9
|
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
[Enhancement] Multi year financial statements
|
2016-08-23 11:32:08 +05:30 |
|
Nabin Hait
|
423f39b4f0
|
Merge pull request #6101 from bcornwellmott/ppt_test2
Upgraded PPT for more variety of MR creation options. Added tests
|
2016-08-23 11:31:17 +05:30 |
|
Rushabh Mehta
|
3d93ddc606
|
[fix] docs links
|
2016-08-22 18:48:04 +05:30 |
|
Nabin Hait
|
c525449c13
|
Merge pull request #6139 from PawanMeh/fixes_6089
[fix] #6089
|
2016-08-22 18:10:14 +05:30 |
|
Rohit Waghchaure
|
ca4d9b54cd
|
fixed accumulated values for cash flow
|
2016-08-22 17:51:58 +05:30 |
|
Pawan Mehta
|
bee3b40725
|
Update gross_profit.py
|
2016-08-22 17:47:13 +05:30 |
|