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
|
6b8435c902
|
Merge pull request #6172 from joopdorresteijn/patch-1
Update user-restriction.md
|
2016-08-26 10:50:54 +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 |
|
joopdorresteijn
|
8da1e9eeb8
|
Update user-restriction.md
Sales user also doesn't exist
|
2016-08-25 15:46:24 +08:00 |
|
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 |
|
Nabin Hait
|
cfbd0199eb
|
Merge branch 'master' into develop
|
2016-08-23 12:10:56 +05:30 |
|
Nabin Hait
|
ec6267e82a
|
Merge branch 'hotfix'
|
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 |
|
pawan
|
18bb431baa
|
[fix] #6089
|
2016-08-22 17:27:22 +05:30 |
|
Nabin Hait
|
8f782e71af
|
Merge pull request #6149 from nabinhait/change_log_v7
Change logs for v7
|
2016-08-22 15:56:32 +05:30 |
|
Nabin Hait
|
dac204b1e3
|
Merge pull request #6124 from rohitwaghchaure/hotfix
[POS] Fixed issue of paid amount, write off account
|
2016-08-22 15:56:20 +05:30 |
|
Nabin Hait
|
9c786948d5
|
Merge pull request #6125 from nabinhait/lcv_hotfix
[fix] Repost only distinct purchase receipts and invoices
|
2016-08-22 15:53:21 +05:30 |
|
Nabin Hait
|
6f1795cb3d
|
Merge pull request #6146 from neilLasrado/operation
Operations related fixes
|
2016-08-22 15:52:57 +05:30 |
|
Nabin Hait
|
01b555edc7
|
Change logs for v7
|
2016-08-22 15:50:21 +05:30 |
|
Nabin Hait
|
c95a3180c2
|
Merge pull request #6127 from KanchanChauhan/demo-fixes-salary
Demo updated for new salary structure
|
2016-08-22 15:22:41 +05:30 |
|
Neil Trini Lasrado
|
20b01873ab
|
Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank
|
2016-08-22 15:05:50 +05:30 |
|
Rushabh Mehta
|
114cb9f1dc
|
Merge pull request #6145 from netchampfaris/help-feature
Added help links
|
2016-08-22 15:02:59 +05:30 |
|
Nabin Hait
|
43accf4c07
|
Merge pull request #6144 from nabinhait/timesheet_patch_fix
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:39:01 +05:30 |
|
Faris Ansari
|
3a6155b1b9
|
add help_links.js
|
2016-08-22 14:37:22 +05:30 |
|
Nabin Hait
|
64e0d16e6d
|
Merge pull request #6141 from frappe/revert-6140-timesheet_patch_fix
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
|
2016-08-22 14:36:55 +05:30 |
|
Nabin Hait
|
5c9a2b39bc
|
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
|
2016-08-22 14:36:33 +05:30 |
|
Nabin Hait
|
1b9f8006c2
|
Merge pull request #6140 from nabinhait/timesheet_patch_fix
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:36:08 +05:30 |
|
Nabin Hait
|
9239ed5c44
|
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:35:06 +05:30 |
|
pawan
|
851e05672c
|
[fix] #6089
|
2016-08-22 14:25:17 +05:30 |
|
Nabin Hait
|
17824c74cf
|
Merge pull request #6135 from KanchanChauhan/minor-salary-fixes
[Minor]Fixes
|
2016-08-22 12:12:02 +05:30 |
|
Kanchan Chauhan
|
681a86d70e
|
[Minor]Fixes
|
2016-08-22 00:28:20 +05:30 |
|
Rohit Waghchaure
|
26b646f8a3
|
Added validation for fiscal year
|
2016-08-21 17:14:12 +05:30 |
|
Kanchan Chauhan
|
db197d593a
|
Demo updated for new salary structure
|
2016-08-20 00:30:59 +05:30 |
|
Rohit Waghchaure
|
713e2b7b62
|
[POS] Fixed issue of paid amount, write off account
|
2016-08-19 19:27:16 +05:30 |
|
Rohit Waghchaure
|
4275c30059
|
[Enhancement] Multi year financial statements
|
2016-08-19 18:04:32 +05:30 |
|
Nabin Hait
|
3b6dc141c6
|
[fix] Repost only distinct purchase receipts and invoices
|
2016-08-19 16:39:50 +05:30 |
|
Nabin Hait
|
4cda566139
|
Merge pull request #6120 from KanchanChauhan/images-for-salary-doc
Better images for redesigned salary docs
|
2016-08-19 12:50:25 +05:30 |
|
Kanchan Chauhan
|
3769996dfd
|
Images for redesigned salary docs
|
2016-08-18 23:06:16 +05:30 |
|
Nabin Hait
|
6b3706aef8
|
Update move_employee_parent_to_child_in_salary_structure.py
|
2016-08-18 17:32:53 +05:30 |
|
Rushabh Mehta
|
69349f2672
|
[fix] [patch] column conversion before item reload
|
2016-08-18 17:06:55 +05:30 |
|
Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|