Nabin Hait
06b27757ab
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
...
[Sales Return] Minor fix in patch
2016-08-26 12:33:33 +05:30
Rohit Waghchaure
e21e1ebae2
[Sales Return] Minor fix in patch
2016-08-26 12:31:41 +05:30
Nabin Hait
a26bb96d2d
Merge pull request #6178 from nabinhait/status_updater_fix
...
Ignore validating billed amount against order if order item amount is zero
2016-08-26 12:09:39 +05:30
Nabin Hait
fbe1563101
Merge pull request #6168 from rohitwaghchaure/hotfix
...
[POS] Fixed payment gl entry for sales return
2016-08-26 11:58:46 +05:30
Nabin Hait
47a3f639ed
Ignore validating billed amount against order if order item amount is zero
2016-08-26 11:39:39 +05:30
Rohit Waghchaure
efb5bf2cfc
[POS] Fixed payment gl entry for sales return
2016-08-25 16:23:47 +05:30
Rohit Waghchaure
0788ee62c1
Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount'
2016-08-25 12:46:34 +05:30
Nabin Hait
db05ac2414
bumped to version 7.0.32
2016-08-23 12:40:56 +06:00
Rohit Waghchaure
ea6d7e9b09
[Fix] decimal button not working
2016-08-23 11:39:44 +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
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
Nabin Hait
9239ed5c44
Ignore validating mandatory fields on converting timelogs to timesheets
2016-08-22 14:35:06 +05:30
Rohit Waghchaure
713e2b7b62
[POS] Fixed issue of paid amount, write off account
2016-08-19 19:27:16 +05:30
Nabin Hait
3b6dc141c6
[fix] Repost only distinct purchase receipts and invoices
2016-08-19 16:39:50 +05:30
Nabin Hait
9a1bcac576
bumped to version 7.0.31
2016-08-18 16:45:49 +06:00
Nabin Hait
e68b089187
Query for warehouse in delivery note
2016-08-18 16:14:23 +05:30
Nabin Hait
d8a372587d
[fix] Legend in support analytics chart
2016-08-18 16:14:23 +05:30
Nabin Hait
f04ce3c5a6
[fix] check expense agaist budget
2016-08-18 16:14:23 +05:30
Nabin Hait
50f8262ac7
Currency fix in reports
2016-08-18 16:14:23 +05:30
Nabin Hait
f0937bf722
bumped to version 7.0.30
2016-08-18 16:43:15 +06:00
Nabin Hait
4810831678
Merge pull request #6107 from neilLasrado/develop
...
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
2016-08-18 14:21:11 +05:30
Nabin Hait
7cdc6fd789
Merge pull request #6115 from rohitwaghchaure/pos_stock_update_issue
...
[POS] Fixed stock update issue
2016-08-18 14:20:26 +05:30
Rushabh Mehta
03e5ea3a0d
Merge pull request #6114 from hereabdulla/patch-1
...
Update employee_list.js
2016-08-18 14:05:58 +05:30
Rohit Waghchaure
9d5a07d101
[POS] Fixed stock update issue
2016-08-18 13:27:06 +05:30
Rushabh Mehta
b7bc6bd75d
[fix] better message for cost center, fixes #6109
2016-08-18 12:50:58 +05:30
Abdulla P I
23a6d05622
Update employee_list.js
2016-08-18 12:43:19 +05:30
Rushabh Mehta
b969c2cb60
[minor] budget link in cost center, fixes #6093
2016-08-18 12:36:20 +05:30
Neil Trini Lasrado
c4e71fcc51
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
2016-08-17 17:37:19 +05:30
Nabin Hait
734cf70b43
bumped to version 7.0.29
2016-08-17 17:41:09 +06:00
Nabin Hait
6fe3ac49cf
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
...
Allow to edit change amount
2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027
changed field name, validation for change amount account, validation for serial no qty
2016-08-17 16:20:13 +05:30
Nabin Hait
40c60b6182
Default material request type field restored
2016-08-17 16:14:24 +05:30
Nabin Hait
95c998109d
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
...
Validate on changing from Total to Valuation/Valuation&Total when add…
2016-08-17 12:12:14 +05:30
Nabin Hait
33bcaa8a07
Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier
...
Quoted Item Comparison: Button for setting the default_supplier
2016-08-17 11:36:55 +05:30
Nabin Hait
4da2c81641
Merge pull request #6094 from rmehta/sales-purchase-items
...
[revert] is_sales_item, is_purchase_item back
2016-08-17 11:30:37 +05:30
Nabin Hait
613ef344f3
Patch fixed for v6 to v7 migration
2016-08-16 18:31:26 +05:30
Nabin Hait
0c1be8df35
Merge pull request #6096 from rohitwaghchaure/minor_fix
...
[Fix] lwp salary structure
2016-08-16 18:17:14 +05:30
Umair Sayyed
8f7708ed5b
docs updated
2016-08-16 18:13:12 +05:30
Umair Sayyed
1bd9f22add
updated docsgd
2016-08-16 18:08:24 +05:30
Umair Sayyed
f369b5951e
updated docs
2016-08-16 18:08:00 +05:30
Umair Sayyed
81995389ac
updated docs
2016-08-16 18:08:00 +05:30
Rohit Waghchaure
fe913c9969
[Fix] lwp salary structure
2016-08-16 15:43:50 +05:30
Nabin Hait
91d6544958
bumped to version 7.0.28
2016-08-16 15:55:33 +06:00
Nabin Hait
39bc4b2a4c
Ignore overlap validation while creating timesheet from existing time logs
2016-08-16 15:18:28 +05:30
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Nabin Hait
df9cf2ef8e
Merge pull request #6068 from neilLasrado/develop
...
Added image field to guardian, program enrollment, fixed some typos
2016-08-16 11:01:58 +05:30
Nabin Hait
528ab53b3a
Merge pull request #6067 from rohitwaghchaure/pos_fixes
...
[POS] fixed issue of negative stock
2016-08-16 11:00:31 +05:30
Rohit Waghchaure
9cd356c7f0
[POS] Fixed print qty decimal issue
2016-08-16 10:44:21 +05:30
Rushabh Mehta
de08639d49
[minor] fixes to patches while moving from v5
2016-08-16 10:01:56 +05:30
Neil Trini Lasrado
987009bf35
Update quotation.json
2016-08-12 16:44:00 +05:30
Rushabh Mehta
3f22ec9536
bumped to version 7.0.27
2016-08-12 12:23:08 +06:00
Rushabh Mehta
d643f2b249
[minor] fixes #6074 ;
2016-08-12 10:36:59 +05:30
Ben Cornwell-Mott
b739dd24b2
Added a button to assist in setting the default_supplier
2016-08-11 19:45:55 -07:00
Neil Trini Lasrado
c917423b01
Fixed typo in quotation, added image feild in Program Enrollment
2016-08-11 18:22:45 +05:30
Neil Trini Lasrado
6a23016f90
Added image feild to guardian
2016-08-11 17:28:21 +05:30
Rushabh Mehta
730f3e7aba
[minor] remove validation #4904
2016-08-11 17:17:26 +05:30
Rohit Waghchaure
033ed00c56
[POS] fixed issue of negative stock
2016-08-11 16:37:29 +05:30
Rushabh Mehta
6c0d9579d2
Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue
...
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 10:55:10 +05:30
Rohit Waghchaure
e78ef5f8c8
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 00:46:15 +05:30
Rohit Waghchaure
315a5e1b4d
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
2016-08-11 00:35:00 +05:30
Rushabh Mehta
cf80f850bd
bumped to version 7.0.26
2016-08-10 20:17:23 +06:00
Rushabh Mehta
36f2d4f81e
[fix] patch for schools;
2016-08-10 19:46:12 +05:30
Rushabh Mehta
a7d92bc8f6
Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue
...
[Fix] Serial no search issue, if serial no is similar with item code.
2016-08-10 18:52:17 +05:30
Rushabh Mehta
18480bdc23
bumped to version 7.0.25
2016-08-10 18:49:14 +06:00
Rushabh Mehta
4b08f9ad1f
[fix] patch
2016-08-10 18:18:14 +05:30
Rohit Waghchaure
ea5a32d304
[Fix] Searial no search issue, if serial no is similar with item code
2016-08-10 17:18:52 +05:30
Rushabh Mehta
d908b99b00
bumped to version 7.0.24
2016-08-10 15:04:39 +06:00
Rushabh Mehta
6646960e31
Merge pull request #6045 from bcornwellmott/quotereportcurrency
...
Quoted item currency
2016-08-10 14:26:25 +05:30
Rushabh Mehta
185c247286
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
...
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 14:25:42 +05:30
Rushabh Mehta
a56121a342
Merge pull request #6034 from netchampfaris/ui-fixes
...
[ui] fix thumbnail for long images in image view frappe/erpnext#1939
2016-08-10 14:24:58 +05:30
Rushabh Mehta
cc054a5bbc
[minor] fix reload for school migrate patch
2016-08-10 14:24:16 +05:30
pawan mehta
399a4bf201
[fix] #5723
2016-08-10 13:20:16 +05:30
Rohit Waghchaure
70be24d6f0
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 13:16:39 +05:30
Rushabh Mehta
6ddbb8820a
Merge pull request #6047 from revant/develop
...
[fix] Issue #6046 group_name replaced with name
2016-08-10 12:57:53 +05:30
Rushabh Mehta
6252e935a0
Merge pull request #5844 from bcornwellmott/quoteditemplot-1
...
Added C3.JS Plot to compare quotes in Print view
2016-08-10 12:50:36 +05:30
Revant Nandgaonkar
5bbc68df8b
[fix] Issue #6046 group_name replaced with name
2016-08-10 11:06:31 +05:30
aruizramon
8bd2487533
semicolon
2016-08-09 16:04:45 -04:00
Alec Ruiz-Ramon
08fb39f1ba
Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct'
2016-08-09 15:38:34 -04:00
Rohit Waghchaure
baef2624a2
Given provision to enter write off and change amount on POS
2016-08-10 00:50:53 +05:30
Nabin Hait
f44b5152d2
Portal settings for schools
2016-08-09 17:08:13 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +05:30
Nabin Hait
08e2105b09
bumped to version 7.0.23
2016-08-09 16:00:31 +06:00
Nabin Hait
11d565b07c
Update migrate_schools_to_erpnext.py
2016-08-09 15:23:01 +05:30
Nabin Hait
508542d4d9
bumped to version 7.0.22
2016-08-09 15:30:16 +06:00
Nabin Hait
50ff8471e0
Merge pull request #6023 from neilLasrado/docs
...
Merged docs for schools to erpnext docs
2016-08-09 14:23:48 +05:30
Nabin Hait
2275cd15e6
[patch] Reload Purchase Invoice in patch
2016-08-09 14:21:29 +05:30
Faris Ansari
d217387400
[ui] fix thumbnail for long images in image view
2016-08-09 14:15:59 +05:30
Nabin Hait
ee018b5ae1
[fix]Patch order changed. Fixed #6026
2016-08-09 11:27:28 +05:30
Rohit Waghchaure
c41ab8d15b
Added change amount account
2016-08-08 23:19:18 +05:30
Rohit Waghchaure
7127a8f522
Allow user to edit change amount from sales invoice form for is pos
2016-08-08 23:19:18 +05:30
Neil Trini Lasrado
acf85dffc5
Merged docs for schools to erpnext docs
2016-08-08 18:59:15 +05:30
Nabin Hait
d5c83122f2
bumped to version 7.0.21
2016-08-08 16:20:00 +06:00
Nabin Hait
ae65172dca
Added 'Ledger' button to show accounting entries against PCV
2016-08-08 15:44:45 +05:30
Nabin Hait
d261d40c7e
Fixed test cases for period closing voucher
2016-08-08 15:44:45 +05:30
Nabin Hait
4b231c2692
Merge pull request #6018 from rohitwaghchaure/add_calendar_to_timesheets
...
Added a Calendar view for timesheet logs
2016-08-08 14:46:18 +05:30
Ben Cornwell-Mott
ed1b8cfe3f
Added a Calendar view for timesheet logs
2016-08-08 14:17:06 +05:30
Nabin Hait
99d4ff4a29
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:12:58 +05:30
Nabin Hait
595dbd6dea
Merge pull request #5963 from neilLasrado/assessment
...
Assessment Groups
2016-08-08 12:50:10 +05:30
Nabin Hait
f979b18ddb
Merge pull request #6003 from neilLasrado/bug-fix
...
[bug fix] Fixed bug in fee caclulation, renamed functions
2016-08-08 12:44:27 +05:30
Nabin Hait
3ef6e7847e
Merge pull request #6010 from rohitwaghchaure/minor_fix_pos
...
[Fix] pos ambiguous issue
2016-08-08 12:40:28 +05:30
Nabin Hait
2dba3b5e25
Merge pull request #6012 from bohlian/develop
...
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
2016-08-08 12:40:00 +05:30
Nabin Hait
2cb8c6a867
Merge pull request #6015 from nabinhait/ar_ap_cols
...
[fix] Label for ageing cols in AR/AP report
2016-08-08 12:37:19 +05:30
Nabin Hait
c30c342bdf
[fix] Label for ageing cols in AR/AP report
2016-08-08 11:47:13 +05:30
Neil Trini Lasrado
f02a0d4d24
[bug fix] Fixed bug in fee caclulation, renamed functions
2016-08-08 11:09:29 +05:30
Ben Cornwell-Mott
44f85fed26
Converted to a common currency (company)
2016-08-07 10:29:51 -07:00
Rohit Waghchaure
cd6c00d505
[Fix] pos ambiguous issue
2016-08-07 14:29:21 +05:30
Javier Wong
e6cd228288
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
...
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `
- A better fix than 316f78f859
2016-08-07 16:01:49 +08:00
Saurabh
ec14c81ebd
[minor][fix] return if account details not found
2016-08-07 08:52:45 +05:30
Nabin Hait
537301a210
bumped to version 7.0.20
2016-08-06 14:45:34 +06:00
Nabin Hait
f1d8fc3d51
Merge pull request #6008 from KanchanChauhan/leave-application-validation
...
Leave Application Validation for processed salary
2016-08-06 14:13:46 +05:30
Nabin Hait
20b4666e89
Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups
...
fixes and cleanups.
2016-08-06 14:11:24 +05:30
Rushabh Mehta
84969bdb2d
Merge pull request #6007 from KanchanChauhan/task-json-fixed
...
[Minor] Removed hard coded success URL from task webform
2016-08-06 13:42:50 +05:30
Kanchan Chauhan
705384d8fe
Leave Application Validation for processed salary
2016-08-06 13:42:18 +05:30
Rohit Waghchaure
b77a1057ce
fixes and cleanups.
2016-08-06 12:45:02 +05:30
Kanchan Chauhan
93b1f2ad72
[Minor] Removed hard coded success URL
2016-08-06 12:09:08 +05:30
Revant Nandgaonkar
9a433ffca1
[fix] success_url Issue #6004
2016-08-05 21:44:34 +05:30
Nabin Hait
82446bf83e
bumped to version 7.0.19
2016-08-05 17:15:14 +06:00
Nabin Hait
c72f8976aa
Merge pull request #5989 from umairsy/2aug
...
updated docs
2016-08-05 15:50:34 +05:30
Neil Trini Lasrado
50b2278eda
Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch
2016-08-05 15:09:49 +05:30
Nabin Hait
e1d85f2467
Payment Entry fix: Unallocated amount in payment entry considering deductions
2016-08-05 14:51:36 +05:30
Umair Sayyed
3962cded76
updated docs
2016-08-04 19:01:02 +05:30
Umair Sayyed
66360f694e
updated docs
2016-08-04 19:01:02 +05:30
Umair Sayyed
5dba950afa
docs update
2016-08-04 19:01:02 +05:30
Umair Sayyed
6a3f51bee2
updated docs
2016-08-04 19:01:02 +05:30
Rushabh Mehta
efe1ab742f
[minor] fixes for demo
2016-08-04 17:29:46 +05:30
Rushabh Mehta
4d32d5301a
Merge pull request #5996 from KanchanChauhan/users-selection-for-project
...
'Project Users' role not required to add user to the project
2016-08-04 14:25:52 +05:30
Kanchan Chauhan
58bc00f954
Project Users role not required to add user to the project
2016-08-04 14:21:20 +05:30
Nabin Hait
155074479b
Merge pull request #5986 from nabinhait/pe_fix_101
...
Set received amount based on paid amount if currency is same
2016-08-03 17:54:01 +05:30
Nabin Hait
764e6ef210
default material request type field restored in item
2016-08-03 17:32:26 +05:30
Rushabh Mehta
f2d89987f5
[minor] ignore email validation if comes from email;
2016-08-03 16:42:29 +05:30
Rushabh Mehta
06c92a782a
[fix] small text for route
2016-08-03 16:27:11 +05:30
Nabin Hait
f43e49f378
Set received amount based on paid amount if currency is same
2016-08-03 14:17:05 +05:30
Rushabh Mehta
ea5ad84c5e
[minor] fix image for demo
2016-08-02 21:26:04 +05:30
Nabin Hait
1b9a01b6c3
bumped to version 7.0.18
2016-08-02 18:37:52 +06:00
Nabin Hait
ae921ce2c8
[patch] Set default material request type in Item based on default bom
2016-08-02 18:02:31 +05:30
Nabin Hait
cc13a9f2f6
bumped to version 7.0.17
2016-08-02 17:46:46 +06:00
Nabin Hait
97c74f9f8f
Merge pull request #5925 from rohitwaghchaure/bcornwellmott-1
...
PPT looks at default MR type in Item to set MR type.
2016-08-02 17:15:02 +05:30
Nabin Hait
6620e2a494
Test case fixed for pos gl entry
2016-08-02 17:14:28 +05:30
Rohit Waghchaure
08aadb853c
PPT looks at default MR type in Item to set MR type.
2016-08-02 16:59:03 +05:30
Nabin Hait
3bb1a421f0
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
2016-08-02 16:41:15 +05:30
Nabin Hait
afc0bbc8ff
Merge pull request #5964 from frappe/neilLasrado-patch-1-1
...
Fixes for patch - make_guardian.py
2016-08-02 11:30:45 +05:30
Rohit Waghchaure
7f031d1bfd
minor fix in payment entry
2016-08-02 11:07:40 +05:30
Neil Trini Lasrado
5bb2f56b47
Update make_guardian.py
2016-08-02 00:01:00 +05:30
Nabin Hait
94542e104c
bumped to version 7.0.16
2016-08-01 18:37:20 +06:00
Nabin Hait
3b8109780f
[patch] reload guardian interest
2016-08-01 17:59:46 +05:30
Nabin Hait
f863055b91
Merge pull request #5955 from umairsy/28jul
...
added documentation for the new features
2016-08-01 17:53:26 +05:30
