Nabin Hait
befa8d613f
Merge pull request #3750 from nabinhait/payreco
...
Minor fixes
2015-07-30 11:50:19 +05:30
Nabin Hait
9e26bcfeeb
[fix] Actual tax amount should be negative while creating return entry
2015-07-30 11:48:18 +05:30
Neil Trini Lasrado
f948fea3bf
simulate added to make_time_log in test_time_log
2015-07-29 18:48:58 +05:30
Neil Trini Lasrado
d851bd8d85
Fixed test cases related to Time Logs
2015-07-29 18:48:58 +05:30
Neil Trini Lasrado
e73941b9cc
Fixes in leave application
2015-07-29 18:39:27 +05:30
Nabin Hait
f33787a706
[fix] Get serial nos using FIFO in Return Delivery Note
2015-07-29 18:08:10 +05:30
Nabin Hait
fcc4021e44
minor fix in payment reconciliation
2015-07-29 17:41:51 +05:30
Nabin Hait
7364ebaff6
minor fix
2015-07-29 16:41:23 +05:30
Nabin Hait
fd8f34018d
Change log added
2015-07-29 16:38:02 +05:30
Nabin Hait
d1dc622914
[fix][patch] Reload Leave Type
2015-07-29 16:37:02 +05:30
Nabin Hait
b24d2efc4b
[fix] Updated 'Include Holiday' in existing and default leave type records
2015-07-29 16:15:08 +05:30
Nabin Hait
a184fbfa66
Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop
2015-07-29 16:05:47 +05:30
Nabin Hait
763821d57d
Merge pull request #3746 from nabinhait/get_item_details
...
[fix] Get item details based on selected company
2015-07-29 16:02:39 +05:30
Nabin Hait
453cc374d4
- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice
...
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
2015-07-29 15:59:57 +05:30
Nabin Hait
43e46a8506
Merge pull request #3733 from nabinhait/fix3
...
POS Profile: removed income account, cost center, territory and bank/cash account from mandatory
2015-07-29 15:57:05 +05:30
Nabin Hait
2c95130451
Merge pull request #3741 from nabinhait/sponsors
...
sponsors page updated
2015-07-29 15:54:58 +05:30
Nabin Hait
d46fb5eb8c
Merge pull request #3743 from rmehta/indicator-fix
...
[fix] indicators for sales order, purchase order #3736
2015-07-29 15:53:44 +05:30
Nabin Hait
e95c18a42d
Merge pull request #3744 from nabinhait/return
...
Sales / Purchase Return Improvements
2015-07-29 15:51:34 +05:30
Nabin Hait
18c2c54633
Merge pull request #3718 from rmehta/item-cleanup
...
[cleanup] yes/no selects changed to checks in Item
2015-07-29 15:49:54 +05:30
Nabin Hait
0edec9d25b
Merge pull request #3730 from nabinhait/fix1
...
minor fixes
2015-07-29 15:48:24 +05:30
Nabin Hait
15216fdd6f
[fix] Get item details based on selected company
2015-07-29 15:47:45 +05:30
Nabin Hait
9117af3077
[fix] Uncheck Is POS option while creating return entry against POS Invoice
2015-07-29 15:40:59 +05:30
Rushabh Mehta
92b6f76612
[fix] disable save in naming series
2015-07-29 15:17:30 +05:30
Rushabh Mehta
8bf0b89595
[minor] currency field in list view for item price
2015-07-29 14:55:48 +05:30
Nabin Hait
746c162055
Return status in listview for return entry
2015-07-29 14:54:33 +05:30
Nabin Hait
9eb9ccd785
Make Debit / Credit Note button in Purchase / Sales Invoice
2015-07-29 13:23:37 +05:30
Nabin Hait
1e046aa49a
Hide buttons for return entry
2015-07-29 13:16:37 +05:30
Nabin Hait
3ad26e4dd1
Fix Against Voucher in GL Entry for return against purchase invoice
2015-07-29 13:15:57 +05:30
Rushabh Mehta
2f3b097d63
[fix] indicators for sales order, purchase order #3736
2015-07-29 13:08:27 +05:30
Nabin Hait
c505cbc988
sponsors page updated
2015-07-29 12:34:18 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Anand Doshi
0e6f2474e8
[minor] removed trailing space in offer letter status
2015-07-29 11:27:02 +05:30
Meatechsupport
e102332f08
removed testcase
2015-07-28 19:03:30 +04:00
Meatechsupport
145227e4ec
Edited the Test case
2015-07-28 18:39:04 +04:00
Nabin Hait
18e033514e
Merge pull request #3679 from neilLasrado/freeze-customer
...
Added ability to freeze Customer/Supplier
2015-07-28 15:21:06 +05:30
Nabin Hait
26052df76e
POS Profile: removed income account, cost center, territory and bank-cash account from mandatory
2015-07-28 15:12:54 +05:30
Nabin Hait
b2f354a614
Merge pull request #3731 from nabinhait/fix2
...
[fix] Contact section visibility in Warranty Claim
2015-07-28 15:12:22 +05:30
Rushabh Mehta
49a59c075f
[minor] [setup-wizard] add check for sample data
2015-07-28 12:23:40 +05:30
Neil Trini Lasrado
ff3b220c79
Fixed gl_entry Validation
2015-07-28 12:23:14 +05:30
Neil Trini Lasrado
cc7cb2a70a
Allowed frozen_accounts_modifier to create records against frozen customer/supplier
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734
Test Cases added to check if customer is frozen
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3698b84d7c
Typo fixes in Supplier and Customer Document
2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Nabin Hait
a2f18ba794
[fix] Contact section visibility in Warranty Claim
2015-07-28 12:00:45 +05:30
Nabin Hait
9088432f10
Fetch default expense account and cost center from item if company matches, otherwise fetch from company master
2015-07-28 11:16:22 +05:30
Nabin Hait
c80059e10e
[fix] Ignore making SLE for opening stock reco with zero qty
2015-07-28 11:16:22 +05:30
Anand Doshi
8e8e9c61ca
[minor] Show description in Sales Order
2015-07-28 10:46:14 +05:30
Rushabh Mehta
424f0c7b84
[fix] [setup wizard] ignore fiscal year
2015-07-28 10:36:33 +05:30
Rushabh Mehta
aa5fb5e50e
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 10:31:09 +05:30
Rushabh Mehta
08a60653ba
[fix] [setup wizard] ignore if user is the primary user
2015-07-28 09:22:36 +05:30
Meatechsupport
8b96fdac12
Indentation Error
...
realligned
2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51
IndentationError
...
alligned code
2015-07-27 16:42:22 +04:00
Nabin Hait
0b5260acf0
bumped to version 5.3.1
2015-07-27 17:41:16 +06:00
Nabin Hait
d4be82cf9b
corrected typo
2015-07-27 17:09:54 +05:30
Nabin Hait
b71471fcb5
minor fix
2015-07-27 17:09:07 +05:30
Nabin Hait
228ff87ea2
bumped to version 5.3.0
2015-07-27 16:25:56 +06:00
Nabin Hait
8d8655e1cd
Change log added
2015-07-27 15:54:39 +05:30
Meatechsupport
5c73bafeaa
Modifying the number of leave days calculation part.
...
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.
Add option in the leave type
added a field in the leave type to include and exclude the holidays from
the tolal leave applied days
Added the field
Added a field Include Holiday to leave Type doctype
changed the lable
changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"
Rearranged the function
moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)
Adding test case
added the test case
Added test case
Added test case to test_leave_application.py
adding default value
added default value and corrected the syntax.
IndentationError
removed extra tabs after
2015-07-27 13:46:00 +04:00
Anand Doshi
14859faf17
[minor] Accounts Payable Report Type='Script Report'
2015-07-24 17:30:39 +05:30
Nabin Hait
2b7eda8135
Merge pull request #3683 from nabinhait/return
...
Sales / Purchase Return Enhancement
2015-07-24 16:53:01 +05:30
Anand Doshi
751d7ecd85
Merge pull request #3716 from tmimori/develop
...
Removed HTML from messages
2015-07-24 14:28:59 +05:30
Nabin Hait
6a09b3f7ef
Merge pull request #3702 from neilLasrado/capacity-planning
...
Global switch to set capacity planning in manufacturing
2015-07-24 14:26:28 +05:30
Nabin Hait
21897e3c52
Merge pull request #3714 from nabinhait/fix4
...
[fix] gross profit report
2015-07-24 14:25:35 +05:30
Tsutomu Mimori
196a0bc675
Amend for frappe/erpnext/pull/3716
2015-07-24 17:06:00 +09:00
Tsutomu Mimori
7c011985f0
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-24 17:02:13 +09:00
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
f061877b4f
[fix] Stock Entry permissions
2015-07-24 13:26:54 +05:30
Nabin Hait
04d244a360
Credit Note print format
2015-07-24 13:26:54 +05:30
Nabin Hait
b74999da82
[testcase] Testcase for return purchase invoice
2015-07-24 13:26:53 +05:30
Nabin Hait
061f7079ed
Test case for purchase return
2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122
Test cases for sales return
2015-07-24 13:26:53 +05:30
Nabin Hait
6b25708b7a
Minor fixes
2015-07-24 13:26:53 +05:30
Nabin Hait
623ed57663
Removed Sales/Purchase Return option from Stock Entry
2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Nabin Hait
ada485f096
Outgoing rate in Purchase Return based on reference/original Purchase Receipt rate
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
8a9d41a92e
Modified Test Cases for Production Order
2015-07-24 13:18:45 +05:30
Neil Trini Lasrado
f965c5d203
now_datetime changed to nowdate
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
21647974c4
Test Cases Added to Production Order
2015-07-24 13:14:57 +05:30
Neil Trini Lasrado
9c3dca63fa
Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation
2015-07-24 13:14:56 +05:30
Tsutomu Mimori
c40b99be26
Merge remote-tracking branch 'frappe/develop' into develop
2015-07-23 22:10:40 +09:00
Tsutomu Mimori
982f4ae44d
Removed HTML from messages
2015-07-23 22:09:35 +09:00
Anand Doshi
9257413b68
[minor] Added 'Import Data' in sample data
2015-07-23 18:16:44 +05:30
Neil Trini Lasrado
c723c8b5aa
Disable Capacity Planning label changed to Disable Capacity Planning & Time Tracking in Manufacturing Settings
2015-07-23 17:43:27 +05:30
Neil Trini Lasrado
2771b7d828
Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings
2015-07-23 17:39:35 +05:30
Anand Doshi
75ebed815f
Merge pull request #3711 from nabinhait/budget
...
Validation on Account for assigning budget
2015-07-23 17:26:56 +05:30
Nabin Hait
975ef07c48
Merge pull request #3706 from neilLasrado/variant
...
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-23 17:26:11 +05:30
Nabin Hait
f666535223
[fix] gross profit report
2015-07-23 17:08:44 +05:30
Nabin Hait
08fb19ac8c
Validation on Account for assigning budget
2015-07-23 16:59:43 +05:30
Anand Doshi
db9762be3f
Merge pull request #3712 from rmehta/setup-wizard-fix
...
[fix] contact name in setup wizard
2015-07-23 16:46:09 +05:30
Anand Doshi
03ae61afce
Merge pull request #3681 from rmehta/sample-data
...
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-23 16:45:28 +05:30
Anand Doshi
1847b705fe
Merge pull request #3704 from nabinhait/fix2
...
[fix] SMS status and log
2015-07-23 16:45:00 +05:30
Anand Doshi
4a573a7e8b
Merge pull request #3709 from nabinhait/contacts
...
[cleanup] Party Type deleted
2015-07-23 16:41:36 +05:30
Nabin Hait
f74b9b06f7
Merge pull request #3708 from neilLasrado/material-request
...
Fetch items from Packing List if Exists in Sales Order while raising …
2015-07-23 15:21:50 +05:30
Nabin Hait
2820a8749f
Merge pull request #3710 from neilLasrado/stock-report
...
Opening Balance row added to Stock Ledger Report
2015-07-23 15:21:26 +05:30
Neil Trini Lasrado
13df8a40ef
Validation added to prevent user to Manage Variants if Item Template is Unsaved. Prevented message stating variants updated while saving item template if there are no variants against that item Template
2015-07-23 12:46:59 +05:30
Rushabh Mehta
7cfa5f0508
[fix] contact name in setup wizard
2015-07-23 12:39:44 +05:30
Nabin Hait
bb274fce2e
[cleanup] Party Type deleted
2015-07-23 11:45:30 +05:30
Rushabh Mehta
fec61fe33e
[minor] fix report type for Accounts Payable
2015-07-23 10:39:13 +05:30
Neil Trini Lasrado
d0387f41df
Opening Balance row added to Stock Ledger Report
2015-07-22 18:44:59 +05:30
Neil Trini Lasrado
05d8174696
Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO
2015-07-22 16:31:34 +05:30
Rushabh Mehta
ba02ce6adc
[docs] added description
2015-07-22 15:07:48 +05:30
Anand Doshi
886def0a69
[fix] convert Item and Item Grid images to absolute urls
2015-07-22 14:43:37 +05:30
Anand Doshi
7590aa2524
[minor] raise EmptyStockReconciliationItemsError when no change in any of the items
2015-07-22 14:43:36 +05:30
Neil Trini Lasrado
8b48ceab8c
Removed logic for get_item_details in Production Planning Tool, Used get_item_details function of Production Order instead
2015-07-22 12:42:21 +05:30
Nabin Hait
d900e12ae7
Change log for sms
2015-07-22 12:21:55 +05:30
Nabin Hait
098760f0e2
[fix] SMS status and log
2015-07-22 12:17:48 +05:30
Neil Trini Lasrado
cc431716ed
Fetch Template Bom if no BOM is set against Item Variant in Production Order
2015-07-22 12:13:47 +05:30
Nabin Hait
e2b8ccf1bb
[report] Letter Head option in General Ledger report
2015-07-21 12:02:36 +05:30
Anand Doshi
f447c8258a
[minor] Newsletter Message should be mandatory
2015-07-20 16:10:04 +05:30
Nabin Hait
63d345c6ab
bumped to version 5.2.1
2015-07-20 15:52:10 +06:00
Anand Doshi
d0d1af2072
Merge pull request #3696 from nabinhait/fix1
...
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 13:27:47 +05:30
Anand Doshi
83694fd180
[minor] removed is_group from search fields of Account
2015-07-20 13:26:22 +05:30
Anand Doshi
fc353efeca
Merge pull request #3670 from neilLasrado/expense-claim
...
Default Expense Account added to Expense Claim Type.
2015-07-20 13:04:33 +05:30
Anand Doshi
16edf8b478
Merge pull request #3685 from nabinhait/fix6
...
[fix] Fetch debit/credit from reference journal entry
2015-07-20 13:00:10 +05:30
Nabin Hait
c9e4fbeda0
[fix][report] Show only active employee in Employee leave balance report
2015-07-20 12:57:48 +05:30
Anand Doshi
46ae789f2f
Merge pull request #3682 from anandpdoshi/anand-july-17
...
Remove 'Stopped' banner in Sales Order, show ERPNext icon instead of 'ERPNext'
2015-07-20 12:57:17 +05:30
Anand Doshi
a9a284a5ae
Merge pull request #3693 from rmehta/close-task
...
[minor] close button for task and item not found error fix
2015-07-20 12:56:50 +05:30
Rushabh Mehta
823e88d5bd
[minor] close button for task and item not found error fix
2015-07-20 10:56:39 +05:30
Nabin Hait
1be94efcfa
[fix] Fetch debit/credit from reference journal entry
2015-07-17 17:25:52 +05:30
Anand Doshi
a5e9c71397
[ui] changed Learn icon
2015-07-17 15:55:10 +05:30
Anand Doshi
285135da8e
[ui] Remove 'Stopped' alert banner in Sales Order
2015-07-17 15:14:40 +05:30
Anand Doshi
906c2babaa
[ui] Show ERPNext icon instead of ERPNext in navbar
2015-07-17 15:14:39 +05:30
Nabin Hait
14a394cde1
Update fields_to_be_renamed.py
2015-07-17 15:14:19 +05:30
Nabin Hait
3c821c89f2
Update rename_table_fieldnames.py
2015-07-17 15:13:29 +05:30
Nabin Hait
a041297861
Update rename_total_fields.py
2015-07-17 15:12:52 +05:30
Rushabh Mehta
856ee10dc4
[enhancement] update to setup wizard, added users, employees, sample data
2015-07-17 15:03:18 +05:30
Nabin Hait
1401e3f679
Update rename_total_fields.py
2015-07-17 14:43:19 +05:30
Nabin Hait
dae29bf2d4
Update fields_to_be_renamed.py
2015-07-17 14:42:46 +05:30
Nabin Hait
0a3be6da27
Update rename_table_fieldnames.py
2015-07-17 14:39:41 +05:30
Nabin Hait
1c9a7d2a1b
bumped to version 5.2.0
2015-07-16 17:45:40 +06:00
Anand Doshi
972f2f9194
[change-log]
2015-07-16 16:19:30 +05:30
Anand Doshi
239296d16a
Merge pull request #3657 from nabinhait/fix4
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-16 15:57:59 +05:30
Anand Doshi
3210db9056
Merge pull request #3656 from rmehta/sms-log
...
[fix] create SMS Log
2015-07-16 15:56:08 +05:30
Neil Trini Lasrado
feda4f9bc9
Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry
2015-07-16 15:44:56 +05:30
Anand Doshi
f6954fb798
Merge pull request #3663 from neilLasrado/bom
...
Bom
2015-07-16 15:02:40 +05:30
Anand Doshi
c6656e68b8
Merge pull request #3666 from nabinhait/patch-fix
...
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 14:55:35 +05:30
Rushabh Mehta
f3791797d6
[fix] [patch]
2015-07-16 14:17:59 +05:30
Rushabh Mehta
ea4d63cef3
[cleanup] removed welcome emails
2015-07-16 14:17:59 +05:30
Nabin Hait
5464ca8a73
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
2015-07-16 12:19:57 +05:30
Neil Trini Lasrado
20523c45c7
Patch for default BOM
2015-07-16 11:27:06 +05:30
Neil Trini Lasrado
0248811e53
Fixed deafault BOM problem
2015-07-16 11:26:40 +05:30
Rushabh Mehta
51e7086a08
[patch] rename roles
2015-07-15 16:30:49 +05:30
Anand Doshi
5e849ae53e
[help] added new links to Learn
2015-07-15 15:23:02 +05:30
Anand Doshi
f3a67c4533
[fix] Mozilla hack for images in table for print
2015-07-15 12:37:45 +05:30
Nabin Hait
0847f9a074
Reserved warehouse should not be validated on cancellation of sales order
2015-07-14 18:23:05 +05:30
Anand Doshi
9490c21b8a
Merge pull request #3641 from rmehta/role-rename
...
[rename] Material User > Stock User
2015-07-14 12:10:48 +05:30
Rushabh Mehta
bdb71bca4e
[perm] added stock, project user for company
2015-07-14 11:54:42 +05:30
Anand Doshi
e8861e2871
Merge pull request #3649 from rmehta/purchase-invoice-fix
...
[fix] supplier invoice number fix
2015-07-14 11:50:07 +05:30
Anand Doshi
b084b5e449
Merge pull request #3651 from rmehta/pos-default-pay-fix
...
[fix] pos default payment #3631
2015-07-14 11:49:46 +05:30
Anand Doshi
41d3e57702
Merge pull request #3650 from rmehta/time-log-fix-2
...
[fix] overlap fix in time log #3647
2015-07-14 11:45:49 +05:30
Rushabh Mehta
dacf127f1b
[fix] time log overlap condition, #SavedByATestCase
2015-07-14 11:06:28 +05:30
Rushabh Mehta
2b49f9b30a
[fix] pos default payment #3631
2015-07-14 11:01:42 +05:30
Rushabh Mehta
533434e878
[fix] overlap fix in time log #3647
2015-07-14 10:39:33 +05:30
Rushabh Mehta
1956028ddc
[fix] supplier invoice number fix
2015-07-14 10:26:50 +05:30
Rushabh Mehta
a87dc3b4e6
[minor] move position in accounts settings
2015-07-14 10:22:07 +05:30
Rushabh Mehta
97b3f750c9
[fixes] hours in time-log #3644 , project buttons on condition, removed Guest permission in notification_control
2015-07-14 10:14:48 +05:30
Anand Doshi
e6f7ac961f
[fix] Add to Cart visibility, Customer's Price List in Shopping Cart and Address creation from Shopping Cart
2015-07-13 16:24:37 +05:30
Rushabh Mehta
cf26964deb
Merge pull request #3640 from anandpdoshi/anand-july-13
...
Fixes to Issues
2015-07-13 15:37:11 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Anand Doshi
c530161de0
[fix] Item image urls can now have paranthesis
2015-07-13 15:05:39 +05:30
Nabin Hait
54ade0d26c
bumped to version 5.1.6
2015-07-13 14:56:23 +06:00
Neil Trini Lasrado
1cd049d824
Sales BOM to Product Bundle rename changes
2015-07-13 14:17:42 +05:30
Nabin Hait
1540ad12f9
bumped to version 5.1.5
2015-07-13 13:39:05 +06:00
Nabin Hait
76bd015b2c
Merge pull request #3637 from rmehta/time-log-filter
...
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 13:04:03 +05:30
Rushabh Mehta
e9604d8484
[minor] [enhancement] added employee filter in timelog #3607
2015-07-13 12:47:45 +05:30
Neil Trini Lasrado
008d1a0334
Fixes in Stock Entry
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
fe2ffaeafa
Fixes in Production Planning Tool
2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
dcef448f1e
Planned Start Date added to Production Planning Tool
2015-07-13 12:41:28 +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
700434ff37
has_variants made 'no copy' in Item Master
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
6cfab43d5f
Renamed Depends on LWP field in the Earning and Deduction table of Salary Slip.
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
09a66c4201
Fixed issue with Customer Contacts in Transaction Documents
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
c70109d0c5
Item table made mandatory in Stock Reconciliation
2015-07-13 12:40:57 +05:30
Neil Trini Lasrado
ccf8c337f7
Expected Delivery date validation changed to message
2015-07-13 12:40:57 +05:30
Nabin Hait
6809b4d86c
Merge pull request #3636 from neilLasrado/po
...
Patch for Production Order Track Operation
2015-07-13 12:38:45 +05:30
Neil Trini Lasrado
cc08c68153
Patch for Production Order Track Operation
2015-07-13 12:35:20 +05:30
Nabin Hait
7daa7900ea
Merge pull request #3614 from neilLasrado/po
...
Track Operations added to Production Order
2015-07-13 12:29:45 +05:30
Nabin Hait
7641f3fe53
Merge pull request #3635 from nabinhait/fix3
...
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 12:28:49 +05:30
Neil Trini Lasrado
4f33249e1c
Fixes in Production Order
2015-07-13 12:26:33 +05:30
Nabin Hait
b95b606f25
sponsors page and change log
2015-07-13 12:26:24 +05:30
Nabin Hait
e690f245f2
Change log and Sponsors page
2015-07-13 12:26:24 +05:30
Neil Trini Lasrado
5da4d857c9
Track Operations added to Production Order
2015-07-13 12:01:57 +05:30
Nabin Hait
6e38e917eb
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 11:36:36 +05:30
Rushabh Mehta
f3b0b95b15
[fix] [filter] for general ledger
2015-07-13 10:24:25 +05:30
Nabin Hait
7b0f1ffb2d
Merge pull request #3627 from nabinhait/fix2
...
PP Tool: Create production order if applicable for item
2015-07-10 17:32:16 +05:30
Nabin Hait
97bb6bbaf4
Merge pull request #3621 from neilLasrado/batch
...
Validation added to prevent adding items with expired batch numbers t…
2015-07-10 17:31:52 +05:30
Neil Trini Lasrado
cb4b2ec52a
Fixes in validate baatch function
2015-07-10 17:31:06 +05:30
Nabin Hait
f18bbcef86
PP Tool: Create production order if applicable for item
2015-07-10 17:31:03 +05:30
Nabin Hait
93d3c82737
minor fix in due date validation
2015-07-10 17:12:08 +05:30
Neil Trini Lasrado
03bf529622
Validation added to prevent adding items with expired batch numbers to stock ledger entry
2015-07-10 16:20:21 +05:30
Nabin Hait
6c4085fc0c
Merge pull request #3616 from nabinhait/credit_days
...
Customer's credit days based on fixed days / last day of the next month
2015-07-10 16:16:14 +05:30
Nabin Hait
c37484c8da
Merge pull request #3622 from rmehta/minor-fixes
...
[fix] cart and general leger report
2015-07-10 16:12:01 +05:30
Rushabh Mehta
b4ec294463
Merge pull request #3625 from neilLasrado/task
...
Validation added to prevent task being closed with open dependent tasks
2015-07-10 14:30:46 +05:30
Neil Trini Lasrado
58406a920c
Validation added to prevent task being closed with open dependent tasks
2015-07-10 12:57:49 +05:30
Pratik Vyas
53829707ad
Fix lang code for česky
2015-07-10 12:05:53 +05:30
Pratik Vyas
fcc31028c6
Update translations
2015-07-10 12:05:24 +05:30
Rushabh Mehta
fc3d87181a
[fix] cart and general leger report
2015-07-10 10:11:07 +05:30
Nabin Hait
6336ff7323
minor fixes
2015-07-09 19:48:21 +05:30
Nabin Hait
fde13e666a
Merge pull request #3609 from rmehta/address-link
...
[fix] link address via owner, if created in portal #3540
2015-07-09 19:09:39 +05:30
Nabin Hait
f80c09290e
Merge pull request #3610 from nabinhait/variants
...
Adding rows not allowed in Variant table in Manage Variants and Item
2015-07-09 19:07:56 +05:30
Nabin Hait
b797963bd8
Merge pull request #3618 from neilLasrado/naming
...
Validation added in Production Order
2015-07-09 18:53:39 +05:30
Nabin Hait
03b42a7934
Merge pull request #3619 from neilLasrado/contact
...
Allowed same contact to be Linked to Customer AND Supplier AND Sales …
2015-07-09 18:52:22 +05:30
Nabin Hait
5cbe3441e8
Reload doctype in patch
2015-07-09 18:42:15 +05:30
Nabin Hait
0724449d0e
[patch] Set 'Credit days based on' in existing customer, customer group and company
2015-07-09 17:49:50 +05:30
Neil Trini Lasrado
5a6ff218e8
Allowed same contact to be Linked to Customer AND Supplier AND Sales Partner
2015-07-09 17:49:40 +05:30
Nabin Hait
122e4e0a96
Currency symbol fixed in sales invoice outstanding and advance amount
2015-07-09 17:36:58 +05:30
Neil Trini Lasrado
e233f0e2ff
Validation added in Production Order to prevent PO against Item Template or if Allow PO is No in Item Master
2015-07-09 17:35:51 +05:30
Nabin Hait
40e92b679b
Posting date trigger function commonified
2015-07-09 17:12:23 +05:30
Nabin Hait
4770a1abb5
Customer's credit days based on fixed days / last day of the next month
2015-07-09 16:35:53 +05:30
Rushabh Mehta
ccb9117ba5
[minor] Added employees in Newsletter List
2015-07-09 13:56:02 +05:30
Nabin Hait
db938762c7
[fix] Adding rows not allowed in Variant table in Manage Variants and Item form
2015-07-09 11:55:38 +05:30
Rushabh Mehta
f0737667c6
[fix] link address via owner, if created in portal #3540
2015-07-09 11:09:01 +05:30
Nabin Hait
2d83122c6b
removed client side test cases
2015-07-08 18:02:42 +05:30
Nabin Hait
e2b7f832cc
Test case fixed
2015-07-08 17:56:06 +05:30
Nabin Hait
ab1acb460b
bumped to version 5.1.4
2015-07-08 17:23:55 +06:00
Nabin Hait
30960e6a06
Change log added
2015-07-08 16:46:28 +05:30
Nabin Hait
736000c223
Merge pull request #3600 from neilLasrado/batch
...
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 16:10:21 +05:30
Nabin Hait
4017bfcd2e
Merge pull request #3591 from rmehta/salary-manager-fix
...
[fixes] salary manager #3554
2015-07-08 15:39:33 +05:30
Nabin Hait
e594e5de49
Merge pull request #3596 from neilLasrado/pos
...
Mode of Payment added to POS Profile
2015-07-08 15:36:30 +05:30
Neil Trini Lasrado
ebb60f5dbc
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 15:24:02 +05:30
Neil Trini Lasrado
75b00e3958
Mode of Payment added to POS Profile
2015-07-08 14:43:47 +05:30
Nabin Hait
5e3646ad6e
validation message fix
2015-07-08 14:39:03 +05:30
Nabin Hait
4439d8264f
minor fix
2015-07-08 14:32:56 +05:30
Nabin Hait
00d79eb68d
minor fix
2015-07-08 14:32:27 +05:30
Nabin Hait
28a9e35de9
Validate item rate with reference document with tolerance 0.009
2015-07-08 13:10:59 +05:30
Nabin Hait
c450536a2c
[fix] Map values in Debit / Credit Note from Stock Entry
2015-07-08 13:10:59 +05:30
Nabin Hait
3b3c48c877
[fix] Set Customer name in opportunity as per company name in lead
2015-07-08 13:10:59 +05:30
Rushabh Mehta
621d6eac3c
[minor] added calendar hooks
2015-07-08 12:39:27 +05:30
Rushabh Mehta
f9b356992a
[fixes] salary manager #3554
2015-07-07 16:30:29 +05:30
Nabin Hait
9a38e669ef
bumped to version 5.1.3
2015-07-06 16:02:32 +06:00
Nabin Hait
9269813207
Added change log
2015-07-06 15:13:35 +05:30
Nabin Hait
0e6f92efa8
Merge pull request #3571 from neilLasrado/item-varients
...
Fixes for Item Attributes
2015-07-06 14:56:33 +05:30
Neil Trini Lasrado
1a0e86f11d
Update item_attribute.py
...
Error Description Changed
2015-07-06 14:46:06 +05:30
Nabin Hait
73b7efd61d
Merge pull request #3583 from rmehta/quotation-list-fix
...
[fix] quotation list #3492
2015-07-06 14:31:23 +05:30
Nabin Hait
4c4a5b968c
Merge pull request #3576 from nabinhait/variant
...
[fix][patch] delete item variant attributes if no variants exists against that item
2015-07-06 14:30:48 +05:30
Nabin Hait
7b5ac6396a
Merge pull request #3575 from nabinhait/batch_report
...
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-06 14:30:23 +05:30
Nabin Hait
01771e8afc
Merge pull request #3573 from rmehta/fix-labels
...
[fix] [minor] fix customer_name, supplier_name labels
2015-07-06 14:30:13 +05:30
Nabin Hait
347c4affe9
Merge pull request #3567 from rmehta/item-description-mozilla-fix
...
[fix] item image in mozilla #3412 #3413
2015-07-06 14:27:34 +05:30
Nabin Hait
526957505f
Merge pull request #3569 from rmehta/employee-unset-user-id
...
[fix] remove user permission if user id is unset #3447
2015-07-06 14:27:22 +05:30
Nabin Hait
faa3416852
Merge pull request #3570 from rmehta/remove-masters-from-setup
...
[minor] remove the term 'Masters' from setup, it is confusing and not used anywhere, add Company to Accounts tab
2015-07-06 14:26:51 +05:30
Rushabh Mehta
56912791e2
[fix] quotation list #3492
2015-07-06 11:14:31 +05:30
Rushabh Mehta
38647c68b9
Merge pull request #3579 from neilLasrado/autocomplete
...
Autocomplete issues fixed in Manage Variants
2015-07-05 13:52:56 +05:30
Neil Trini Lasrado
4d64acfafc
Autocomplete issues fixed in Manage Variants
2015-07-04 14:50:00 +05:30
Nabin Hait
d7441ec051
[fix][patch] delete item variant attributes if no variants exists against that item
2015-07-03 19:20:27 +05:30
Nabin Hait
24efb3122a
[fix] Hide zero balance rows in batch-wise balance history report
2015-07-03 15:20:14 +05:30
Rushabh Mehta
85e6f5d04e
[fix] [minor] fix customer_name, supplier_name labels
2015-07-03 12:59:08 +05:30
Neil Trini Lasrado
1faaf71dfc
Auto-Capitalize Item Attribute Abbreation, Prevent attribute to be deleated if Variant exists
2015-07-03 12:44:01 +05:30
Tsutomu Mimori
5a0fbff1a3
#3402
2015-07-03 16:08:02 +09:00
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
5688a6c31a
[fix] remove user permission if user id is unset #3447
2015-07-03 11:34:53 +05:30
Rushabh Mehta
71349d221b
[fix] item image in mozilla #3412 #3413
2015-07-03 10:43:35 +05:30
Nabin Hait
37c6ce7b1e
bumped to version 5.1.2
2015-07-02 18:28:40 +06:00
Nabin Hait
fcee17fd16
Removed purchase item validation
2015-07-02 17:51:35 +05:30
Nabin Hait
5906f02e3a
update item image in invoice if item exists
2015-07-02 17:51:35 +05:30
Nabin Hait
6385967ccd
bumped to version 5.1.1
2015-07-02 17:03:52 +06:00
Nabin Hait
34058ded0e
[fix] Update item image in sales invoice
2015-07-02 16:31:55 +05:30
Nabin Hait
e98120b716
[fix] Change log path
2015-07-02 16:29:28 +05:30
Nabin Hait
bc176b6bf8
bumped to version 5.1.0
2015-07-02 15:58:49 +06:00
Nabin Hait
784b49e54e
change log
2015-07-02 15:28:15 +05:30
Nabin Hait
dffd7c3889
Change log
2015-07-02 15:21:25 +05:30
Nabin Hait
0c7594e5ed
Merge pull request #3557 from rmehta/item-description-in-form
...
[fix] show item description in form grid based on in_list_view
2015-07-02 15:19:24 +05:30
Rushabh Mehta
5105f909d6
[fix] show item description in form grid based on in_list_view
2015-07-02 15:09:18 +05:30
Nabin Hait
7580723ab3
Recurring docs should not consider Stopped documents and should be scheduled for hourly
2015-07-02 14:41:27 +05:30
Rushabh Mehta
2cd02af80a
[fix] patch date
2015-07-02 14:25:51 +05:30
Rushabh Mehta
0b0ec3536c
[change-log] added
2015-07-02 14:25:51 +05:30
Rushabh Mehta
6b35ea873b
[fix] against account in general ledger will show party
2015-07-02 14:25:51 +05:30
Nabin Hait
ecf220a721
Merge pull request #3549 from neilLasrado/item-varients
...
Validation changed for Item Template cannot have Stock
2015-07-02 14:18:31 +05:30
Nabin Hait
04fb1c7fe4
Merge pull request #3550 from neilLasrado/item-desc
...
Image feild added to Sales Invoice & Purchase Invoice
2015-07-02 14:17:52 +05:30
Neil Trini Lasrado
53bd62eafc
Validation changed for Item Template cannot have Stock
2015-07-02 14:15:23 +05:30
Nabin Hait
fdd0db3459
Update project completion percentage and costing after syncing task
2015-07-02 14:09:49 +05:30
Nabin Hait
f92465981c
datetime issue fixed in maintenance schedule
2015-07-02 14:09:49 +05:30
Nabin Hait
885c70984d
[fix] Always show Sales invoice in Gross profit report
2015-07-02 14:09:49 +05:30
Neil Trini Lasrado
9c15ef903d
Image feild added to Sales Invoice & Purchase Invoice
2015-07-02 13:09:57 +05:30
Rushabh Mehta
bc799885d0
[fix] bom client script
2015-07-02 12:44:16 +05:30
Neil Trini Lasrado
fe9cd1d875
More Fixes in Manage Varients
2015-07-01 14:41:30 +05:30
Neil Trini Lasrado
64fbe955c7
Modified Date changed for Item Doctype
2015-07-01 14:04:00 +05:30
Neil Trini Lasrado
0988440fd9
Fixes for Manage Variants
2015-07-01 13:17:15 +05:30
Neil Trini Lasrado
274dd4ada0
Fixed Manage Variants Attribute autocomplete appearance.
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
724fd82419
Fixes in Manage Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
3f2604eff6
Patch for Item Variants
2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
c761fefb78
more fixes in test records
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
203cb10ef7
fixes in test cases
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
90c66b1998
test cases added
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
fed431f908
Code Fixes in Manage Variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
bd9745ba72
Rename Item Variant from Manage Variants feature Added.
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
8fb123b20e
item variants, creation, deleation and update logic added.
...
logic added to copy changes in template to variants
2015-07-01 12:51:11 +05:30
Neil Trini Lasrado
333ccd212b
variants combination generation logic added
2015-07-01 12:51:10 +05:30
Neil Trini Lasrado
c8cc8b7115
manage variants new doctype created
2015-07-01 12:51:10 +05:30
Neil Trini Lasrado
a25e8ea0bc
Fixed Issues in Project Task
2015-06-30 17:15:13 +05:30
Rushabh Mehta
ea02b9a5c3
Merge pull request #3530 from anandpdoshi/anand-june-29
...
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-30 13:05:19 +05:30
Rushabh Mehta
74a63bf003
Merge pull request #3531 from pdvyas/exchange-rate-api
...
Change currency exchange rate api to fixer.io
2015-06-30 12:46:52 +05:30
Pratik Vyas
a0f2510b01
Change currency exchange rate api to fixer.io
2015-06-30 12:36:17 +05:30
Anand Doshi
0820161157
[fix] Item Variant Attribute autocomplete appearance. Fixes #3488 , #3515 , #3525
2015-06-29 20:57:06 -07:00
Nabin Hait
56bc215855
Merge pull request #3505 from neilLasrado/print-format
...
Recurring Invoice Print Format
2015-06-29 18:54:24 +05:30
Nabin Hait
8687d25f7e
Merge pull request #3526 from neilLasrado/minor-fixes
...
Minor fixes
2015-06-29 18:53:10 +05:30
Nabin Hait
e06d01e3ed
Delete events via query instead of delete_doc function, to save time
2015-06-29 18:38:38 +05:30
Nabin Hait
11243a4fb4
Show amount in Journal Entry list view
2015-06-29 18:38:38 +05:30
Neil Trini Lasrado
b9e5cd0df4
Fixed lead status not updating on Creation of oppurtunity issue
2015-06-29 17:01:32 +05:30
