Commit Graph

14186 Commits

Author SHA1 Message Date
Tropicalrambler
3ebd956090 Duplicate last line delete
Deleted the last line which was duplicated. Both read exactly the same.  Only one line is necessary.
2016-02-07 18:56:44 -06:00
Tropicalrambler
b01f1d2486 Corrected typo while translating
Found a switch of letters:  "wrokstation" instead of "workstation".  Corrected the item appropriately.  Found this while translating my fork of this page to spanish.
2016-02-07 16:39:12 -06:00
Agus Syahputra
4c0c69b388 Update calendar.md 2016-02-07 11:45:10 +07:00
Rushabh Mehta
16d58560a0 Merge pull request #4750 from agusputra/patch-10
Update wesite-home-page.md
2016-02-06 09:40:05 +05:30
Rushabh Mehta
dd556e7a89 Merge pull request #4749 from agusputra/patch-9
Update blogger.md
2016-02-06 09:39:36 +05:30
Agus Syahputra
12acd11814 Update wesite-home-page.md 2016-02-06 08:13:29 +07:00
Agus Syahputra
c4d3283879 Update blogger.md 2016-02-06 07:21:42 +07:00
Valmik Jangla
de7e760788 Employees with no attendance show up as blank 2016-02-05 17:46:14 +05:30
Nabin Hait
c2268caaf7 Merge pull request #4740 from vjFaLk/holiday-report-improvements
Added From and To date to Holiday Report
2016-02-05 15:13:11 +05:30
Valmik Jangla
235de6566e Minor fix 2016-02-05 15:07:16 +05:30
Nabin Hait
acd9040346 Merge pull request #4746 from agusputra/patch-8
Update overwriting-data-from-data-import-tool.md
2016-02-05 14:38:22 +05:30
Agus Syahputra
e24cfdc556 Update overwriting-data-from-data-import-tool.md 2016-02-05 08:27:20 +07:00
Chris Ian Fiel
53a46f68a2 Merge pull request #1 from ccfiel/ccfiel-patch-1
Update bank_reconciliation.py
2016-02-04 22:12:41 +08:00
Chris Ian Fiel
af667f77e6 Update bank_reconciliation.py
set to null if clearance_date is blank because if not it will set it just 0000-00-00.
2016-02-04 22:10:36 +08:00
Nabin Hait
ce4e8ec178 Merge pull request #4737 from ShashaQin/patch-18
Gross Profit report improvement
2016-02-04 17:26:20 +05:30
Nabin Hait
4129ae5395 [fix] Translations in Stock balance report 2016-02-04 17:22:57 +05:30
Nabin Hait
92c6c617de [fix] Remove filters on item group in territory and sales person target settings 2016-02-04 17:22:57 +05:30
Nabin Hait
a731ad4433 [fix] Set party account on chnage of company 2016-02-04 17:22:57 +05:30
Nabin Hait
3110c4a772 [fix] Make bank entry from expense claim 2016-02-04 17:22:57 +05:30
Rushabh Mehta
d50356dbab [docs] remove /docs/current from repo, they are re-built anyways 2016-02-04 17:10:24 +05:30
Rushabh Mehta
d1ba86a952 Merge branch 'develop' of github.com:frappe/erpnext into develop 2016-02-04 17:09:18 +05:30
Nabin Hait
03f7aa9dab Merge pull request #4741 from ShashaQin/patch-20
Report Improvement -  Item Wise Sales/Purchase History report
2016-02-04 14:38:29 +05:30
ShashaQin
8c63697f41 Update item_wise_purchase_history.json 2016-02-04 16:46:46 +08:00
ShashaQin
e7dccca782 Update item_wise_sales_history.json 2016-02-04 16:44:18 +08:00
Valmik Jangla
8d0ed21c04 Added From and To date to Holiday Report
Changed HD to H in Monthly Attendance Report
2016-02-04 12:18:55 +05:30
ShashaQin
bcc56a4557 Update gross_profit.py
Gross Profit report improvement
2016-02-04 11:45:00 +08:00
Rushabh Mehta
7bb2f3a27b [fix] newsletter priority 2016-02-03 16:20:59 +05:30
Nabin Hait
2d4cc7e71f Merge branch 'develop' v6.20.0 2016-02-03 15:23:56 +05:30
Nabin Hait
fba61abd2a bumped to version 6.20.0 2016-02-03 15:53:56 +06:00
Nabin Hait
94bfe8ea0d [change-log] 2016-02-03 15:14:17 +05:30
Nabin Hait
31619f0a83 [docs] 2016-02-03 15:13:55 +05:30
Nabin Hait
34037e0d88 [translations] 2016-02-03 13:11:06 +05:30
Nabin Hait
647102fc94 Merge pull request #4729 from vjFaLk/doc-update
Updated documentation for new features
2016-02-03 13:01:02 +05:30
Nabin Hait
a533b33fc6 Merge pull request #4730 from nabinhait/ShashaQin-patch-8
Financial Statements: Accumulated periodic balance based on filters
2016-02-03 12:55:36 +05:30
ShashaQin
995a71c854 Update leave_application.py
fix half day leave issue
2016-02-03 13:10:15 +08:00
Nabin Hait
bd7f48cfd4 [report] Financial Statements: Accumulated periodic balance based on filters 2016-02-02 19:05:43 +05:30
Nabin Hait
82cef59fb3 [fix] Purchase Return warehouse validation 2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac Update financial_statements.py 2016-02-02 19:05:42 +05:30
ShashaQin
15d7224335 Update balance_sheet.py 2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827 Update profit_and_loss_statement.py 2016-02-02 19:05:42 +05:30
ShashaQin
539a826b37 Update financial_statements.js
Adding Accumulated Values check box on Profit and Loss, Balance Sheet
2016-02-02 19:05:42 +05:30
Valmik Jangla
0ec9b90113 Updated documentation 2016-02-02 18:29:09 +05:30
Nabin Hait
49b275ad1d Merge pull request #4704 from chaoyee/develop
Update material_request.py
2016-02-02 16:11:35 +05:30
Nabin Hait
7957f0ecea Merge pull request #4726 from nabinhait/develop
Multiple fixes
2016-02-02 16:08:40 +05:30
Nabin Hait
3c55d89f7f [minor] Reference doctype in Item-wise price List Rate report 2016-02-01 15:55:09 +05:30
Nabin Hait
d5fda57297 [fix] Ignore permissions and made Customer warehouse field hidden in selling cycle 2016-02-01 15:55:09 +05:30
Nabin Hait
a85a1ff145 [fix] Validate rate with reference doc 2016-02-01 15:55:09 +05:30
Nabin Hait
afb8ec9cb6 [fix] Validate company abbr 2016-02-01 15:55:09 +05:30
Nabin Hait
8b92de26f0 Merge pull request #4718 from vjFaLk/holiday-fix
Fixed issue where no Holidays would cause the report to break
2016-02-01 15:49:15 +05:30
Nabin Hait
fcd4f2b86b Merge pull request #4706 from vrms/vrms-patch-1
Update implementation-strategy.md
2016-02-01 15:47:57 +05:30