Nabin Hait
4647f24865
Merge pull request #5625 from KanchanChauhan/salary-component-cleanup
...
Salary component cleanup
2016-07-06 12:06:05 +05:30
Kanchan Chauhan
d963b76a4b
Salary component cleanup
2016-07-06 12:04:38 +05:30
Saurabh
52ec0ed134
[fix] link fixes for tree structures #5651
2016-07-05 18:05:45 +05:30
Saurabh
066ae8e4c4
[fix] make cheque print compatible with payment entry
2016-07-05 12:46:38 +05:30
Nabin Hait
e4bbb696ab
Payment Entry minor improvements
2016-07-04 17:26:02 +05:30
Nabin Hait
221fa98b51
Payment Entry: Payment period based on invoice date
2016-07-04 11:42:24 +05:30
Kanchan Chauhan
fb3eb13ca4
New Maintenance Module
2016-06-29 15:51:02 +05:30
Rushabh Mehta
26a76fb2d9
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
...
Newsletter moved to Frappe
2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216
Newsletter moved to Frappe
2016-06-28 17:28:40 +05:30
Rohit Waghchaure
d6c986da8f
[Enhancement] Time log wages and multiple active salary structure
2016-06-27 16:46:39 +05:30
Saurabh
ec8babe7ac
[minor][fix]
2016-06-25 11:06:14 +05:30
Saurabh
1702273968
[fix] rename account browser and sales browser to tree/doctype for view
2016-06-25 11:06:14 +05:30
Rushabh Mehta
8a065e0028
[rename] Bulk Email to Email Queue
2016-06-22 12:58:39 +05:30
Rushabh Mehta
4cf914d902
[minor] added mins to first response for opportunity
2016-06-22 11:22:12 +05:30
Rushabh Mehta
f7e6ec0654
[report] minutes to first response for issues
2016-06-14 18:08:51 +05:30
Nabin Hait
b46d021f2a
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 15:26:01 +05:30
Nabin Hait
b9bc7d6df3
[feature] New document for Budget
2016-05-23 13:04:26 +05:30
Rohit Waghchaure
e0934d118f
[Fixes] Some changes and fixes
2016-05-16 12:01:16 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Nabin Hait
70f05df075
Asset Movement
2016-04-28 18:01:32 +05:30
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Rushabh Mehta
202cb7cdf1
Merge pull request #5249 from nabinhait/fixed_asset
...
Fixed asset
2016-04-21 11:41:11 +05:30
Rushabh Mehta
c291ab64a6
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
...
[WIP] No not merge
2016-04-21 11:39:45 +05:30
Rushabh Mehta
02772442b6
[cleanup] added dashboard in project
2016-04-20 18:45:56 +05:30
Nabin Hait
cd0e8ce8ad
Fixes and modification in fixed asset
2016-04-20 17:57:12 +05:30
Kanchan Chauhan
2dbf5294a9
[WIP] No not merge
2016-04-20 16:24:24 +05:30
Rushabh Mehta
0e2dd859b0
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
2016-04-13 17:22:09 +05:30
Nabin Hait
9501a1e034
Links for fixed assets added in accounts module page
2016-03-30 15:06:26 +05:30
Rushabh Mehta
c78b3110b5
[enhancement] configurable portal menu;
2016-03-30 12:29:48 +05:30
rohitwaghchaure
44d0449895
[enhancement] request for quotation
2016-03-28 12:13:07 +05:30
Rushabh Mehta
d1e1c52171
[redesign] modules
2016-03-08 18:07:20 +05:30
Neil Trini Lasrado
f5a39d628f
Typo Fixes
2016-02-18 19:19:07 +05:30
Anand Doshi
d843ec5fee
Merge pull request #4831 from neilLasrado/typos
...
Typo fixes in Accounts Module
2016-02-18 17:24:17 +05:30
Neil Trini Lasrado
8e7240a556
Typo fixes in Accounts Module
2016-02-18 14:38:36 +05:30
Anand Doshi
ed8d9dadfa
[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock
2016-02-17 17:14:11 +05:30
Valmik Jangla
07364f5ece
Feature - Employee Attendance Tool
2016-01-29 16:57:54 +05:30
Valmik Jangla
1890c794d7
Added Employee Report Attendance Report
...
Made Holiday details mandatory
2016-01-29 16:57:54 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Rushabh Mehta
1bf440b03a
[fix] module ordering
2016-01-14 18:19:21 +05:30
Saurabh
6fc408e974
[fixes] conmify account details and validate gateway currency
2016-01-12 14:09:51 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Anand Doshi
381cec7b87
[fix] added Shopping Cart and Report Builder in Learn module
2015-12-21 18:56:20 +05:30
Anand Doshi
f773f1f539
[videos] added missing videos
2015-12-21 18:32:23 +05:30
Chris Ian Fiel
826e18a29f
Cash Flow Report
2015-12-12 10:33:01 +08:00
Rushabh Mehta
2f273674e9
[docs] fixed links
2015-12-04 16:00:38 +05:30
Rushabh Mehta
ab7021ce64
[docs] merged kb and cleanup. warning: don't see the commit
2015-12-03 17:59:34 +05:30
Anand Doshi
f942d97a18
[fix] removed UOM Replace Utility from message
2015-11-26 16:08:09 +05:30
Rushabh Mehta
edc8ab03b5
[minor] fixed description
2015-11-18 16:48:19 +05:30
Anand Doshi
1c1eb7018c
[docs] fixed Linked With and title
2015-11-10 18:58:56 +05:30
Nabin Hait
f9ef0e4e15
[docs] Fixed ref docs, image and video links
2015-11-09 15:41:45 +05:30
Nabin Hait
7ba4d02444
[docs] First commit for docs
2015-11-09 14:40:29 +05:30
Rushabh Mehta
7d23e4286e
[minor] move item to top in stock module page
2015-11-03 16:25:09 +05:30
Sambhaji Kolate
fd53991dfa
[minor] Update Help Video Links in Buying, CRM, Selling #4233
2015-10-27 17:01:27 +05:30
Nabin Hait
1b6c00e2c7
[report] Trial Balance for Party
2015-09-25 09:18:03 +05:30
Neil Trini Lasrado
ef511b160e
Added Tax Rule under ERPNext > Accounts > Setup
2015-09-15 15:41:00 +05:30
Anand Doshi
71c33823f6
Merge pull request #3806 from neilLasrado/item-variants
...
Improvements in Item Variants
2015-08-18 16:13:10 +05:30
Anand Doshi
82988be79f
Merge pull request #3846 from rmehta/add-to-learn
...
Learn module
2015-08-18 12:10:03 +05:30
Anand Doshi
fd67ebf66d
Show Communication in CRM
2015-08-17 17:58:51 +05:30
Anand Doshi
1a2e6bf718
Show Communication in CRM
2015-08-14 17:51:14 +05:30
Neil Trini Lasrado
62dba50e9b
Multiple Fixes
2015-08-13 16:18:55 +05:30
Rushabh Mehta
bf4f99adf1
[learn] added modules #3841
2015-08-10 13:21:57 +05:30
Nabin Hait
098760f0e2
[fix] SMS status and log
2015-07-22 12:17:48 +05:30
Anand Doshi
a5e9c71397
[ui] changed Learn icon
2015-07-17 15:55:10 +05:30
Anand Doshi
5e849ae53e
[help] added new links to Learn
2015-07-15 15:23:02 +05:30
Neil Trini Lasrado
6224cfc414
Manage Variants added in Tools under Stock Module
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
4089b3d376
Salary Slip renamed to Process Payroll
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Rushabh Mehta
7278c0ae85
[minor] remove the term 'Masters' from setup, it is confusing and not used anywhere, add Company to Accounts tab
2015-07-03 12:21:50 +05:30
Rushabh Mehta
b45a6bcb88
[report] BOM Search
2015-06-17 01:54:56 +05:30
Nabin Hait
8908543a9c
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:01:56 +05:30
Pratik Vyas
f52b5ac8af
Merge pull request #3339 from rmehta/help
...
[help] added links in modules, added learn desktop module
2015-05-27 15:21:00 +05:30
Nabin Hait
878a18528c
Added BOM Browser link in Manufacturing home page
2015-05-26 12:41:25 +05:30
Rushabh Mehta
6771240471
[help] added links in modules, added learn desktop module
2015-05-25 18:31:08 +05:30
Nabin Hait
3b0adc5246
[fix] ignore share permission while creating events on the background
2015-05-21 16:51:37 +05:30
Rushabh Mehta
a27cca97b5
[rename] POS Setting > POS Profile #3271
2015-05-20 15:43:17 +05:30
Nabin Hait
60ca1c2e87
Customer Addresses And Contacts report
2015-05-14 12:32:26 +05:30
Nabin Hait
4bfbd29411
Permission for Stock ledger and balance report
2015-05-07 15:41:09 +05:30
Rushabh Mehta
2682278ad9
Merge pull request #3221 from neilLasrado/hr
...
employee removed from HR setup
2015-05-07 14:59:45 +05:30
Neil Trini Lasrado
d1c413a668
employee removed from HR setup
2015-05-07 12:40:18 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Rushabh Mehta
14ae4c3603
[email] many fixes, newsletter, unsubscribe
2015-03-19 17:16:03 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Rushabh Mehta
99d0941008
[time logs] fixes
2015-02-24 14:48:11 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
d06c1188a0
[item] patches
2015-02-23 14:43:15 +05:30
Rushabh Mehta
46e03eadca
[rename] Customer Issue -> Warranty Claim
2015-02-17 10:45:50 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Rushabh Mehta
71a6b93d89
[cleanups]
2015-01-19 17:35:05 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Rushabh Mehta
ff58261407
[icons] mfg and shopping cart
2015-01-02 14:40:48 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Rushabh Mehta
7b822abcd6
[desktop] new icons
2014-12-31 14:42:23 +05:30
Rushabh Mehta
afbfdcf552
[ui] minor fixes
2014-12-30 18:11:32 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
ankitjavalkarwork
e6e65b0907
[ #2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report
2014-11-04 14:40:33 +05:30
Nabin Hait
e6370860a0
accounts receivable summary report cleanup
2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af
AR/AP report cleanup
2014-10-30 15:54:39 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Nabin Hait
4f0e5db216
Stock balance grid report deprecated and moved to server side
2014-10-10 20:54:57 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Nabin Hait
996a1010cb
Moved Installation note from tools to documents section
2014-09-26 14:23:00 +05:30
Anand Doshi
11b75759d2
Merge pull request #2194 from ankitjavalkarwork/stockbalreport
...
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Nabin Hait
16e943f120
Removed link of item-wise last purchase rate from buying home page
2014-09-16 12:57:31 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
ankitjavalkarwork
2e07305616
Update report with Valuation rate, stock values, move to Main report
2014-09-11 16:47:19 +05:30
Nabin Hait
12ce3eefca
landed cost voucher added in module page
2014-09-01 18:16:24 +05:30
Rushabh Mehta
72e1719220
added icon for pos
2014-08-08 15:43:26 +05:30
Rushabh Mehta
7a4e739d6c
templating for hr
2014-08-08 11:56:32 +05:30
Anand Doshi
1b90207360
[minor] [fix] Serial No Servic Contract Expiry
2014-07-31 18:57:51 +05:30
Rushabh Mehta
85ff3bcd04
updated pos invoice
2014-07-25 13:01:53 +05:30
Anand Doshi
cb86d597b7
Report: Trial Balance
2014-07-22 19:49:16 +05:30
ankitjavalkarwork
b0cffac79d
Payment Reconciliation Feature/Tool - add in module list
2014-07-22 15:02:59 +05:30
Anand Doshi
825d014616
Commonfied code for Financial Statements and added Profit and Loss Statement
2014-07-21 11:43:18 +05:30
Anand Doshi
fa576a22e3
Balance Sheet
2014-07-21 11:43:18 +05:30
Anand Doshi
e8c5cb8c9a
Fixed Address and Contact report name
2014-07-14 13:10:24 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Anand Doshi
b527e54809
Fixed report: Item wise Price List Rate
2014-06-09 18:08:46 +05:30
Nabin Hait
b7438894f6
Fixes in trends report
2014-06-05 17:55:00 +05:30
Rushabh Mehta
c22e11d483
added address template:
2014-06-05 16:01:55 +05:30
Nabin Hait
19d1e499c3
Removed Purchase in transit report #1435
2014-06-04 19:00:56 +05:30
Nabin Hait
e7546e2305
SMS Settings added in setup and selling module page. Fixes #1693
2014-05-30 11:22:12 +05:30
Nabin Hait
e60853930b
traslation issue fixed in setup wizard and desktop
2014-05-16 19:56:43 +05:30
Anand Doshi
08ef467fc6
Fixed moduleview language issue
2014-05-08 11:43:18 +05:30
Anand Doshi
ef5407479a
Show Chart of Accounts in Accounts > Documents. Fixes #1559
2014-05-02 19:42:27 +05:30
Anand Doshi
f29bcaf436
Added new fixtures ( Fixes #1540 ). Removed Employee Grade from HR.
2014-05-02 13:55:07 +05:30
Nabin Hait
292a254bc1
payment to invoice matching tool disabled temporarily
2014-05-01 15:46:37 +05:30
Rushabh Mehta
52e618d0b2
updates to Setup Wizard, set language as first input
2014-04-17 18:50:33 +05:30
Anand Doshi
c5e057f676
Fixed exploded BOM construction
2014-04-15 16:14:15 +05:30
Rushabh Mehta
7db7112d3f
frappe/frappe#478 fix and added print heading
2014-04-03 15:04:18 +05:30
Nabin Hait
155c96b410
patch to delete mis control and financial statements and set bank/cash account
2014-03-21 12:15:13 +05:30
Anand Doshi
b2c2fca8a5
Added Pricing Rule to Accounts, Buying, Selling home
2014-03-05 18:25:10 +05:30
Anand Doshi
0c4ef64b32
Fixed booboo: Moved website moduleview to framework
2014-03-04 11:15:08 +05:30
Anand Doshi
e30511d315
Email Settings split into Outgoing Email Settings and Support Email Settings
2014-03-03 20:32:20 +05:30
Anand Doshi
64f2ccd9e1
Global Settings in Setup, Sales Master Manager can restrict for Customer
2014-03-03 19:28:30 +05:30
