Nabin Hait
|
0177c02c0f
|
Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue
minor fix
|
2016-12-23 15:19:32 +05:30 |
|
Nabin Hait
|
0e9f16f59d
|
Merge pull request #7289 from rohitwaghchaure/enhancement_timesheet_v7_2
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
|
2016-12-23 15:18:28 +05:30 |
|
Nabin Hait
|
6104fdc579
|
Update repost_stock_for_deleted_bins_for_merging_items.py
|
2016-12-22 17:49:46 +05:30 |
|
bhupen
|
a83de5eac1
|
applicabe charges field is now editable
|
2016-12-22 16:24:14 +05:30 |
|
bhupen
|
914ae77a22
|
Limit instead of Allowance in stock settings
|
2016-12-22 16:24:14 +05:30 |
|
bhupen
|
5bb85e7a95
|
partially orderd status will be shown in material request
|
2016-12-22 16:24:14 +05:30 |
|
bcornwellmott
|
e549984a42
|
Grabs title from SQL
Gets a concatenated title label for the Calendar event that includes the number of hours
|
2016-12-21 12:36:45 -08:00 |
|
bcornwellmott
|
3385bd4921
|
Add hours to label in calendar view
Adds a label for the number of hours to each calendar event
|
2016-12-21 12:33:32 -08:00 |
|
Rohit Waghchaure
|
1af1a43616
|
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
|
2016-12-21 19:19:16 +05:30 |
|
Faris Ansari
|
0822e41f96
|
pos item area scrollable
|
2016-12-21 18:17:00 +05:30 |
|
Revant Nandgaonkar
|
1c00b1fb21
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2016-12-21 18:01:35 +05:30 |
|
Rohit Waghchaure
|
dd58d537d5
|
[Fix] POS issue for serialized items
|
2016-12-21 17:55:40 +05:30 |
|
Rushabh Mehta
|
0632ee3da9
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 17:31:09 +05:30 |
|
Rushabh Mehta
|
c6bd7ade2f
|
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
|
2016-12-21 17:30:29 +05:30 |
|
Kanchan Chauhan
|
58ed0c6efa
|
Create User button in Employee if no User ID selected
|
2016-12-21 16:18:59 +05:30 |
|
Revant Nandgaonkar
|
00e65cb70b
|
Report - Batch Item Expiry Status
Changed column name `Expiry Status` to `Expiry (In Days)`
Changed column type from Data to Int
|
2016-12-21 14:21:53 +05:30 |
|
Rohit Waghchaure
|
9df946e96c
|
[Fix] Warehouse is mandatory for packing materials on the sales invoice
|
2016-12-21 13:27:54 +05:30 |
|
Rohit Waghchaure
|
d567e57f82
|
minor fix
|
2016-12-21 13:18:36 +05:30 |
|
Revant Nandgaonkar
|
c30ae28422
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2016-12-21 12:52:23 +05:30 |
|
Revant Nandgaonkar
|
0766d3e67e
|
Report : Batch Item Expiry Status
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
|
2016-12-21 12:32:12 +05:30 |
|
Nabin Hait
|
e7939fd87b
|
Merge branch 'master' into develop
|
2016-12-21 12:18:38 +05:30 |
|
Nabin Hait
|
399e414909
|
bumped to version 7.1.28
|
2016-12-21 12:48:37 +06:00 |
|
Nabin Hait
|
b3943cb53a
|
Update repost_stock_for_deleted_bins_for_merging_items.py
|
2016-12-21 12:04:39 +05:30 |
|
Nabin Hait
|
2b8aafb08d
|
Merge pull request #7276 from neilLasrado/develop
Allow Data Import for Student Guardian
|
2016-12-21 11:17:13 +05:30 |
|
rohitwaghchaure
|
34e820d02d
|
[Enhancement] Added letter head for the report (#7250)
|
2016-12-20 16:54:24 +05:30 |
|
Rushabh Mehta
|
17d05b4fd7
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-20 12:59:29 +05:30 |
|
Rushabh Mehta
|
5a3f421453
|
[fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474
|
2016-12-20 12:59:09 +05:30 |
|
Rushabh Mehta
|
89af62a680
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-20 12:21:03 +05:30 |
|
Rushabh Mehta
|
2a86c32267
|
[minor] [patch] remove icon if present, fixes #6949
|
2016-12-20 12:20:39 +05:30 |
|
Neil Trini Lasrado
|
8979e1c7a5
|
Allow Data Import for Student Guardian
|
2016-12-20 11:53:52 +05:30 |
|
Nabin Hait
|
f573d43b90
|
fixed version conflict
|
2016-12-20 11:40:15 +05:30 |
|
Nabin Hait
|
1cc2d7403b
|
bumped to version 7.1.27
|
2016-12-20 12:09:46 +06:00 |
|
Nabin Hait
|
778c1a022d
|
Merge pull request #7236 from rohitwaghchaure/item_variant_issue
[Fix] Timeout error in item attribute validation
|
2016-12-20 11:31:50 +05:30 |
|
Rushabh Mehta
|
f944fb9e46
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-19 17:06:56 +05:30 |
|
Rushabh Mehta
|
827588adf2
|
[minor] fixes to job opening
|
2016-12-19 17:06:26 +05:30 |
|
Rushabh Mehta
|
4c210527b2
|
[fix] https for SMS gateway, now using requests fixes #5404
|
2016-12-19 16:22:34 +05:30 |
|
Rushabh Mehta
|
688f2284af
|
[minor] [patch]
|
2016-12-19 13:15:52 +05:30 |
|
Rushabh Mehta
|
c3d8479443
|
[minor] allow website user to be selected as employee
|
2016-12-19 12:32:11 +05:30 |
|
Rushabh Mehta
|
99c814b360
|
[fix] paging for products (support)
|
2016-12-19 11:55:10 +05:30 |
|
Rushabh Mehta
|
43d81063f8
|
Delete zh-tw.csv
|
2016-12-19 11:52:09 +05:30 |
|
Nabin Hait
|
7feef1f158
|
test case fixed
|
2016-12-16 16:50:03 +05:30 |
|
Nabin Hait
|
4d76d27dd2
|
translations
|
2016-12-16 16:18:45 +05:30 |
|
Nabin Hait
|
3fe99559ef
|
Fixed negative stock validation message for translation and fixed test cases
|
2016-12-16 15:30:43 +05:30 |
|
Rohit Waghchaure
|
6500ef404d
|
[Fix] Timeout error in item attribute validation
|
2016-12-16 13:35:50 +05:30 |
|
Rushabh Mehta
|
9277f3250d
|
[minor] partiall ordered in material request #6858
|
2016-12-16 12:36:50 +05:30 |
|
Rohit Waghchaure
|
61fb496be6
|
[Fix] Test case
|
2016-12-16 12:19:56 +05:30 |
|
Nabin Hait
|
43594b245c
|
changed version to beta
|
2016-12-15 19:37:53 +05:30 |
|
Nabin Hait
|
d25db23fdb
|
[translations]
|
2016-12-15 18:33:39 +05:30 |
|
Nabin Hait
|
565844cfac
|
Change log for v7.2.0
|
2016-12-15 17:49:31 +05:30 |
|
Nabin Hait
|
6eda07e445
|
Fixed merge conflict
|
2016-12-15 16:35:58 +05:30 |
|
Nabin Hait
|
8a321406b2
|
bumped to version 7.1.26
|
2016-12-15 17:05:32 +06:00 |
|
Nabin Hait
|
f89c96c7a3
|
Merge branch 'standard_filters' into develop
|
2016-12-15 14:57:41 +05:30 |
|
Nabin Hait
|
f02f1bb0c7
|
Added standard filters
|
2016-12-15 14:57:20 +05:30 |
|
Nabin Hait
|
8c61f343b3
|
Validate negative stock on delivery while missing valuation rate for booking expenses
|
2016-12-15 13:46:03 +05:30 |
|
Nabin Hait
|
0c9c6c9608
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2016-12-15 11:52:59 +05:30 |
|
Nabin Hait
|
f49bbe1142
|
Cleanup of lead and opportunity status updating logic
|
2016-12-15 11:51:54 +05:30 |
|
Rushabh Mehta
|
01fab2ae1c
|
[minor] fix salary slip test
|
2016-12-15 11:43:29 +05:30 |
|
Nabin Hait
|
6a1c0665bc
|
Merge pull request #7227 from nabinhait/country_coa
Chart of accounts for few countries, added test cases for each country
|
2016-12-15 11:31:07 +05:30 |
|
Nabin Hait
|
a107302224
|
Merge pull request #7221 from bhupennewalkar1337/production
Fix#7085 Issue Items Against Production Order
|
2016-12-15 11:30:31 +05:30 |
|
Rushabh Mehta
|
e9d9b8e6f0
|
[fix] demo and process payroll for demo (#7224)
* [fix] demo and process payroll for demo
* [fix] set payroll dates
|
2016-12-15 11:27:35 +05:30 |
|
Nabin Hait
|
1ae8e2c8fa
|
Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232)
|
2016-12-15 11:27:02 +05:30 |
|
Nabin Hait
|
e3edfe2b12
|
Removed quick entry for tax rule
|
2016-12-14 18:44:27 +05:30 |
|
Nabin Hait
|
a756d64fca
|
Chart of accounts for some countries, added test cases for each country
|
2016-12-14 18:40:29 +05:30 |
|
Rushabh Mehta
|
9b049ee154
|
Revert "[Fixes]Payroll Fixes" (#7225)
|
2016-12-14 18:25:11 +05:30 |
|
bhupen
|
9e146669d3
|
Issue Items Against Production Order
|
2016-12-14 17:40:32 +05:30 |
|
Nabin Hait
|
42b6e37d15
|
Merge pull request #7216 from KanchanChauhan/salary-fixes
[Fixes]Payroll Fixes
|
2016-12-14 16:20:08 +05:30 |
|
Kanchan Chauhan
|
c292dd7213
|
[Fixes]Payroll Fixes
|
2016-12-14 15:50:54 +05:30 |
|
Nabin Hait
|
a9ecc0b700
|
Merge branch 'master' into develop
|
2016-12-14 14:33:06 +05:30 |
|
Nabin Hait
|
673d43cc8e
|
bumped to version 7.1.25
|
2016-12-14 15:03:06 +06:00 |
|
Rohit Waghchaure
|
39712b5e1d
|
[Fix] Pricing rule issue
|
2016-12-14 14:12:20 +05:30 |
|
Nabin Hait
|
cdb38de6af
|
Merge pull request #7209 from bhupennewalkar1337/mendatory
[Fix] No exception will be thrown when working hours field is kept blank in workstation #5166
|
2016-12-14 13:03:17 +05:30 |
|
Nabin Hait
|
db4cfeed0e
|
Merge pull request #7211 from frappe/shachiTakalkar-patch-1
Update adding-margin.md
|
2016-12-14 12:54:58 +05:30 |
|
Nabin Hait
|
a933713f9d
|
Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
|
2016-12-14 12:54:04 +05:30 |
|
Nabin Hait
|
aba470f1e6
|
Merge pull request #7206 from strixaluco/develop
[docs] mention UID in LDAP instruction
|
2016-12-14 12:53:33 +05:30 |
|
Nabin Hait
|
3a8ea2a3bb
|
Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2
[POS] Provision to delete the offline records
|
2016-12-14 12:52:28 +05:30 |
|
Nabin Hait
|
36f5471bab
|
Merge pull request #6855 from neilLasrado/training
[new Feature] Added Training Module
|
2016-12-14 12:51:51 +05:30 |
|
Nabin Hait
|
44cdbbe346
|
Merge pull request #7203 from KanchanChauhan/employee-permissions
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
|
2016-12-14 12:50:54 +05:30 |
|
Shachi Takalkar
|
41d4e33682
|
Update adding-margin.md
|
2016-12-14 12:41:07 +05:30 |
|
Neil Trini Lasrado
|
6a2fa29b4a
|
Fixes for training Module
|
2016-12-14 12:08:28 +05:30 |
|
bhupen
|
52b3924006
|
mendatory hours field
|
2016-12-14 11:32:23 +05:30 |
|
OluyomiKay
|
8f8fd39855
|
erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation
|
2016-12-14 13:25:58 +08:00 |
|
Neil Trini Lasrado
|
fef568ecfa
|
Documentation for Training Module
|
2016-12-13 16:48:50 +05:30 |
|
Neil Trini Lasrado
|
984ee372e8
|
[new Feature] Added Training Module
|
2016-12-13 15:42:12 +05:30 |
|
bhupen
|
b42dc5a899
|
mendatory hours field
|
2016-12-13 15:25:53 +05:30 |
|
strixaluco
|
757d127844
|
[docs] mention UID in LDAP instruction
|
2016-12-13 17:54:41 +08:00 |
|
Nabin Hait
|
80cea9795e
|
Address naming if multiple address for same type
|
2016-12-13 14:50:35 +05:30 |
|
Nabin Hait
|
201af80706
|
Fixed merge conflict
|
2016-12-13 14:30:32 +05:30 |
|
Nabin Hait
|
9d56d598bf
|
bumped to version 7.1.24
|
2016-12-13 14:52:15 +06:00 |
|
Kanchan Chauhan
|
b79aa1d091
|
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
|
2016-12-13 14:16:57 +05:30 |
|
Nabin Hait
|
8ecc14b7bd
|
Revert "email cc test fixes for frappe/frappe#2441"
|
2016-12-13 14:11:49 +05:30 |
|
Nabin Hait
|
23165ce0b4
|
Merge pull request #7185 from KanchanChauhan/salary-test-cases
[Fix] Salary Slip test cases fix
|
2016-12-13 12:40:19 +05:30 |
|
Kanchan Chauhan
|
d917b66a31
|
[Fix] Salary Slip test cases fix
|
2016-12-13 12:12:49 +05:30 |
|
Nabin Hait
|
ee877fd631
|
Merge pull request #7199 from RobertSchouten/email_cc_dev
email cc test fixes for frappe/frappe#2441
|
2016-12-13 11:31:06 +05:30 |
|
Nabin Hait
|
784f6cc31a
|
Merge pull request #7181 from KanchanChauhan/sales-person-status
Added "Enabled" to Sales Person
|
2016-12-13 11:28:36 +05:30 |
|
Nabin Hait
|
346a6a5d84
|
Update set_sales_person_status.py
|
2016-12-13 11:27:46 +05:30 |
|
Nabin Hait
|
82ce67d49a
|
Merge pull request #7190 from KanchanChauhan/jinja-in-tc
Jinja template in Terms and Conditions
|
2016-12-13 11:25:07 +05:30 |
|
Nabin Hait
|
18d6dc0459
|
Merge pull request #7193 from KanchanChauhan/get-project-task
Show only Project tasks in depends on tasks
|
2016-12-13 11:24:11 +05:30 |
|
Nabin Hait
|
c5869a00df
|
Merge pull request #7194 from rohitwaghchaure/pricing_rule_issue_v7_1
[Fix] Ignore pricing rule not removed the discount percentage
|
2016-12-13 11:22:49 +05:30 |
|
Nabin Hait
|
9a1a4cd0ac
|
Fixed test cases for item / warehouse renaming
|
2016-12-13 10:46:50 +05:30 |
|
Rohit Waghchaure
|
2976e56d23
|
[Fix] Ignore pricing rule not removed the discount percentage
|
2016-12-13 10:28:27 +05:30 |
|