Commit Graph

17350 Commits

Author SHA1 Message Date
Kanchan Chauhan
7933eb685c [Enhancement] Attendance Module 2017-01-12 17:24:53 +05:30
bcornwellmott
5dfffe7586 Merge pull request #7449 from RicardoJohann/rename_ss
allowed rename salary structure
2017-01-11 09:15:03 -08:00
RicardoJohann
7182de7684 allowed rename salary structure 2017-01-11 06:28:59 -02:00
Nabin Hait
9e08ccdf39 Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Kanchan Chauhan
4a15fa4c86 Sync Project Task and Task 2017-01-10 16:01:38 +05:30
Rushabh Mehta
d40e661ebd [style] better demo start page 2017-01-10 14:46:54 +05:30
Nabin Hait
51d45d8bce Fixed merge conflict 2017-01-10 12:32:01 +05:30
Nabin Hait
b8350353ea Merge branch 'hotfix' 2017-01-10 12:30:10 +05:30
Nabin Hait
4180a37773 bumped to version 7.2.8 2017-01-10 13:00:09 +06:00
Nabin Hait
a7f616564e Merge pull request #7417 from KanchanChauhan/quick-entry-for-item
[Minor] Valuation rate in Quick entry for Item
2017-01-10 12:23:36 +05:30
Nabin Hait
b083591164 Merge pull request #7418 from frappe/revert-7409-daterangecontrol
Revert "proposed usage of daterange picker"
2017-01-10 12:20:14 +05:30
Nabin Hait
01baceb74e Revert "proposed usage of daterange picker" 2017-01-10 12:19:48 +05:30
Kanchan Chauhan
43e07aed2c [Minor]Valuation rate in Quick entry for Item 2017-01-10 12:06:51 +05:30
Nabin Hait
9215581345 Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle
[Fix] Payroll Frequency toggle fix
2017-01-10 11:58:36 +05:30
Kanchan Chauhan
2b41f9d548 [Fix] Payroll Frequency toggle fix 2017-01-09 18:43:52 +05:30
Nabin Hait
ec793b4846 Merge branch 'hotfix' of git://github.com/frappe/erpnext into hotfix 2017-01-09 17:24:10 +05:30
Nabin Hait
6e9d2a3c1f fixed conflict 2017-01-09 17:21:34 +05:30
Nabin Hait
a2fae844b6 Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 17:15:40 +05:30
Nabin Hait
21544ca978 Merge branch 'hotfix' 2017-01-09 16:57:11 +05:30
Nabin Hait
2bb9093b9a bumped to version 7.2.7 2017-01-09 17:27:10 +06:00
Nabin Hait
f0c41b5709 Merge pull request #7412 from nabinhait/hotfix
Allow fetching same items multiple times from source doc if all qty not processed
2017-01-09 16:00:08 +05:30
Nabin Hait
23b836dcdb Merge pull request #7386 from arvindstutzen/patch-1
Update step-8-customer-names.md
2017-01-09 15:55:38 +05:30
Nabin Hait
297ae85c31 Merge pull request #7409 from RobertSchouten/daterangecontrol
proposed usage of daterange picker
2017-01-09 15:55:17 +05:30
Nabin Hait
1839fcca11 Merge pull request #7406 from saurabh6790/terms_and_cond_fix
[fix] if terms exists then only call render_template
2017-01-09 15:49:56 +05:30
Nabin Hait
d1eb237909 Merge pull request #7400 from rohitwaghchaure/minor_issue
Get item default warehouse
2017-01-09 15:49:14 +05:30
Nabin Hait
a9b9edd9bc Merge pull request #7392 from frappe/bcornwellmott-patch-2
Fix number of digits on report
2017-01-09 15:48:04 +05:30
Nabin Hait
07b524ee50 Merge pull request #7398 from nabinhait/filter_dashboard
Reload in_standard_filter property
2017-01-09 15:43:30 +05:30
Nabin Hait
802b4359b5 Fetch same items multiple times from source doc if all qty not processed 2017-01-09 15:32:20 +05:30
nick9822
6f48d4be1c whitelisted erpnext.stock.utils.get_stock_balance (#7402)
whitelisted erpnext.stock.utils.get_stock_balance with respect to
https://github.com/frappe/erpnext/issues/7364
2017-01-09 12:12:36 +05:30
robert schouten
138c2f6b29 [fix] timesheet overlap validation not including modified timesheet 2017-01-09 12:50:35 +08:00
robert schouten
81130e848e proposed usage of daterange picker 2017-01-09 08:38:27 +08:00
Saurabh
f65e8de5a5 [fix] if terms exists then only call render_template 2017-01-07 08:18:10 +05:30
bcornwellmott
34e34ed1e8 Trigger Restart of build checks 2017-01-06 17:21:16 -08:00
Rushabh Mehta
8b133ac087 [minor] [tests] fix, tests will fail on the 5th of a month! 2017-01-06 17:21:04 +05:30
Rohit Waghchaure
6734c4ad5c Get item default warehouse 2017-01-06 14:39:40 +05:30
Nabin Hait
91621639e8 Reload in_standard_filter property 2017-01-06 12:54:16 +05:30
bcornwellmott
a3e7c38734 Fix number of digits on report
Currently the cells can show many digits.
2017-01-05 09:44:18 -08:00
Nabin Hait
7b4bdffea2 Merge pull request #7385 from bhupennewalkar1337/quot
Fix#6590  Now you can make quotation from supplier quotation
2017-01-05 14:58:52 +05:30
Nabin Hait
59a67c3586 Update supplier_quotation.py 2017-01-05 14:58:30 +05:30
Arvind Subramanian
efc9372f46 Update step-8-customer-names.md 2017-01-05 08:34:58 +05:30
bhupen
107099aac9 you can make quotation from supplier quotation 2017-01-04 17:04:12 +05:30
Nabin Hait
d08c248642 Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
britlog
35cefb1275 fix success_list if http status == 200 + utf-8 support + optional success message 2017-01-04 15:53:26 +05:30
Nabin Hait
8281b36a26 Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Nabin Hait
f45851c245 Merge pull request #7379 from KanchanChauhan/accounts-reports
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-04 15:45:39 +05:30
Nabin Hait
0dab40f4a1 Merge pull request #7377 from KanchanChauhan/naming-series
[Fix] Naming series issue
2017-01-04 15:44:00 +05:30
Nabin Hait
96562e3eb7 Merge pull request #7362 from rmehta/minor-fixes
[minor] dont get warehouse in opening entry #7353
2017-01-04 15:42:23 +05:30
Nabin Hait
202bcc09d5 Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Nabin Hait
3051a3dd97 Fixed test case for margin 2017-01-04 15:11:58 +05:30
Kanchan Chauhan
b7cc393eb8 Email ID renamed to Email Address 2017-01-03 16:45:38 +05:30